xdmf-lib.patch

   1 --- Xdmf/CMakeLists.txt.orig    2010-04-05 21:24:41.000000000 +0200
   2 +++ Xdmf/CMakeLists.txt 2013-09-14 07:26:23.036584397 +0200
   3 @@ -41,7 +41,7 @@
   4  INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
   5  INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
   6
   7 -SET(VTK_INSTALL_LIB_DIR "/lib")
   8 +SET(VTK_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}")
   9
  10  OPTION(XDMF_MEMORY_DEBUG "Enable Memory Debugging in Xdmf" OFF)
  11  IF(XDMF_MEMORY_DEBUG)
  12 @@ -63,7 +63,7 @@
  13      SET(XDMF_METIS_INCLUDE_DIR_CONFIG ${METIS_INCLUDE_DIRS})
  14      SET(XDMF_METIS_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/metis)
  15      SET(XDMF_METIS_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
  16 -    SET(XDMF_METIS_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
  17 +    SET(XDMF_METIS_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
  18  ENDIF(XDMF_BUILD_UTILS)
  19
  20  #############################################################################
  21 @@ -130,7 +130,7 @@
  22      SET(XDMF_ZLIB_INCLUDE_DIR_CONFIG ${HDF5_ZLIB_INCLUDE_DIRS})
  23      SET(XDMF_ZLIB_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtkzlib)
  24      SET(XDMF_ZLIB_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
  25 -    SET(XDMF_ZLIB_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
  26 +    SET(XDMF_ZLIB_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
  27      SET(XDMF_ZLIB_LIBRARIES vtkzlib)
  28
  29    ENDIF(XDMF_SYSTEM_ZLIB)
  30 @@ -166,7 +166,7 @@
  31      SET(XDMF_NETCDF_INCLUDE_DIR_CONFIG ${NETCDF_INCLUDE_DIRS})
  32      SET(XDMF_NETCDF_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtknetcdf)
  33      SET(XDMF_NETCDF_LIBRARY_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/bin)
  34 -    SET(XDMF_NETCDF_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
  35 +    SET(XDMF_NETCDF_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
  36
  37    ENDIF(XDMF_BUILD_VTK AND EXISTS ${VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}/vtk_netcdf.h)
  38
  39 @@ -203,7 +203,7 @@
  40      SET(XDMF_EXODUSII_INCLUDE_DIR_CONFIG ${EXODUSII_INCLUDE_DIRS})
  41      SET(XDMF_EXODUSII_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtkexodus2)
  42      SET(XDMF_EXODUSII_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
  43 -    SET(XDMF_EXODUSII_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
  44 +    SET(XDMF_EXODUSII_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
  45
  46    ENDIF(XDMF_BUILD_VTK AND EXISTS ${VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2/exodusII.h)
  47
  48 @@ -242,7 +242,7 @@
  49      SET(XDMF_LIBXML2_INCLUDE_DIR_CONFIG ${XDMF_LIBXML2_INCLUDE_DIRS})
  50      SET(XDMF_LIBXML2_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtklibxml2)
  51      SET(XDMF_LIBXML2_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
  52 -    SET(XDMF_LIBXML2_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
  53 +    SET(XDMF_LIBXML2_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
  54      SET(XDMF_LIBXML2_LIBRARIES ${LIBXML2_LIBRARY})
  55
  56    ELSE(NOT XDMF_SYSTEM_LIBXML2)
  57 @@ -344,7 +344,7 @@
  58    SET(XDMF_HDF5_INCLUDE_CONFIG ${Xdmf_SOURCE_DIR}/Utilities/hdf5 ${Xdmf_BINARY_DIR}/Utilities/hdf5 ${Xdmf_SOURCE_DIR}/Utilities)
  59    SET(XDMF_HDF5_INCLUDE_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtkhdf5)
  60    SET(XDMF_HDF5_LIBRARY_PATH_CONFIG ${Xdmf_BINARY_DIR}/bin)
  61 -  SET(XDMF_HDF5_LIBRARY_PATH_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
  62 +  SET(XDMF_HDF5_LIBRARY_PATH_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
  63    SET(XDMF_HDF5_LIBRARIES ${HDF5_LIBRARY})
  64
  65  ENDIF(XDMF_SYSTEM_HDF5)
  66 @@ -417,7 +417,7 @@
  67    SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
  68
  69    # the RPATH to be used when installing
  70 -  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
  71 +  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
  72
  73    # add the automatically determined parts of the RPATH
  74    # which point to directories outside the build tree to the install RPATH
  75 @@ -473,7 +473,7 @@
  76    ${Xdmf_BINARY_DIR}/XDMFConfig.cmake @ONLY IMMEDIATE)
  77
  78  SET(XDMF_INSTALL_BIN_DIR "/bin")
  79 -SET(XDMF_INSTALL_LIB_DIR "/lib")
  80 +SET(XDMF_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}")
  81  SET(XDMF_INSTALL_INCLUDE_DIR "/include")
  82  SET(XDMF_INSTALL_INCLUDE_VTK_DIR "/include")
  83
  84 @@ -513,11 +513,11 @@
  85       SET(XDMF_INCLUDE_DIRS_CONFIG ${XDMF_INCLUDE_DIRS_CONFIG} ${DOLLAR}{XDMF_INSTALL_DIR}/include/utils)
  86     ENDIF(XDMF_BUILD_UTILS)
  87     SET(XDMF_LIBRARY_DIRS_CONFIG
  88 -     ${DOLLAR}{XDMF_INSTALL_DIR}/lib
  89 +     ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}
  90       )
  91 -   SET(XDMF_USE_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib/XdmfCMake/UseXDMF.cmake)
  92 -   SET(XDMF_BUILD_SETTINGS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib/XdmfCMake/XDMFBuildSettings.cmake)
  93 -   SET(XDMF_LIBRARY_DEPENDS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib/XdmfCMake/XDMFLibraryDepends.cmake)
  94 +   SET(XDMF_USE_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}/XdmfCMake/UseXDMF.cmake)
  95 +   SET(XDMF_BUILD_SETTINGS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}/XdmfCMake/XDMFBuildSettings.cmake)
  96 +   SET(XDMF_LIBRARY_DEPENDS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}/XdmfCMake/XDMFLibraryDepends.cmake)
  97     SET(XDMF_KITS_DIR ${DOLLAR}{XDMF_INSTALL_DIR}/vtk)
  98     CONFIGURE_FILE(${Xdmf_SOURCE_DIR}/XDMFConfig.cmake.in
  99         ${Xdmf_BINARY_DIR}/XDMFConfigInstall.cmake @ONLY IMMEDIATE)
 100 --- Xdmf/Utilities/CMakeLists.txt.orig  2009-01-22 22:47:53.000000000 +0100
 101 +++ Xdmf/Utilities/CMakeLists.txt       2013-09-14 07:38:48.141127926 +0200
 102 @@ -1,9 +1,9 @@
 103  # SET(VTKHDF5_INSTALL_LIB_DIR /lib/Xdmf)
 104 -SET(VTKHDF5_INSTALL_LIB_DIR /lib)
 105 +SET(VTKHDF5_INSTALL_LIB_DIR /lib${LIB_SUFFIX})
 106  SUBDIRS(hdf5)
 107
 108  IF(XDMF_BUILD_VTK)
 109    SUBDIRS(Doxygen)
 110  ENDIF(XDMF_BUILD_VTK)
 111
 112 -SET(VTK_INSTALL_LIB_DIR "/lib")
 113 +SET(VTK_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}")
 114 --- Xdmf/Utilities/metis/CMakeLists.txt.orig    2010-03-24 21:03:47.000000000 +0100
 115 +++ Xdmf/Utilities/metis/CMakeLists.txt 2013-09-14 07:39:44.270398581 +0200
 116 @@ -59,7 +59,7 @@
 117    SET(VTK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
 118  ENDIF(NOT VTK_INSTALL_BIN_DIR_CM24)
 119  IF(NOT VTK_INSTALL_LIB_DIR_CM24)
 120 -  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
 121 +  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 122  ENDIF(NOT VTK_INSTALL_LIB_DIR_CM24)
 123  IF(NOT VTK_INSTALL_INCLUDE_DIR_CM24)
 124    SET(VTK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
 125 --- Xdmf/Utilities/vtkexodus2/CMakeLists.txt.orig       2010-01-06 17:33:02.000000000 +0100
 126 +++ Xdmf/Utilities/vtkexodus2/CMakeLists.txt    2013-09-14 07:40:28.665791674 +0200
 127 @@ -209,7 +209,7 @@
 128    SET(VTK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
 129  ENDIF(NOT VTK_INSTALL_BIN_DIR_CM24)
 130  IF(NOT VTK_INSTALL_LIB_DIR_CM24)
 131 -  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
 132 +  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 133  ENDIF(NOT VTK_INSTALL_LIB_DIR_CM24)
 134  IF(NOT VTK_INSTALL_INCLUDE_DIR_CM24)
 135    SET(VTK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
 136 --- Xdmf/Utilities/vtknetcdf/CMakeLists.txt.orig        2010-01-06 17:34:04.000000000 +0100
 137 +++ Xdmf/Utilities/vtknetcdf/CMakeLists.txt     2013-09-14 07:41:28.941921726 +0200
 138 @@ -264,7 +264,7 @@
 139      SET(VTK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
 140    ENDIF(NOT VTK_INSTALL_BIN_DIR_CM24)
 141    IF(NOT VTK_INSTALL_LIB_DIR_CM24)
 142 -    SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
 143 +    SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 144    ENDIF(NOT VTK_INSTALL_LIB_DIR_CM24)
 145    IF(NOT VTK_INSTALL_INCLUDE_DIR_CM24)
 146      SET(VTK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
 147 --- Xdmf/CMake/setup_install_paths.py.orig      2010-01-06 17:32:58.000000000 +0100
 148 +++ Xdmf/CMake/setup_install_paths.py   2013-09-14 09:27:23.336736013 +0200
 149 @@ -86,8 +86,8 @@
 150          data    = home
 151      elif os.name == 'posix':
 152          ver = sys.version[0:3]
 153 -        purelib = prefix+'/lib/python'+ver+'/site-packages'
 154 -        platlib = exec_prefix+'/lib/python'+ver+'/site-packages'
 155 +        purelib = prefix+'/' + sys.lib + '/python'+ver+'/site-packages'
 156 +        platlib = exec_prefix+'/' + sys.lib + '/python'+ver+'/site-packages'
 157          scripts = prefix+'/bin'
 158          data    = prefix
 159      elif sys.version < '2.2':