hdf5-cmake.patch

   1 --- hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in.orig  1970-01-01 01:00:00.000000000 +0100
   2 +++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in       2013-04-02 18:10:51.166052034 +0200
   3 @@ -0,0 +1,39 @@
   4 +# Generated by CMake 2.8.10.2
   5 +
   6 +IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
   7 +   MESSAGE(FATAL_ERROR "CMake >= 2.6.0 required")
   8 +ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
   9 +CMAKE_POLICY(PUSH)
  10 +CMAKE_POLICY(VERSION 2.6)
  11 +#----------------------------------------------------------------
  12 +# Generated CMake target import file.
  13 +#----------------------------------------------------------------
  14 +
  15 +# Commands may need to know the format version.
  16 +SET(CMAKE_IMPORT_FILE_VERSION 1)
  17 +
  18 +# Create imported target hdf5
  19 +ADD_LIBRARY(hdf5 STATIC IMPORTED)
  20 +
  21 +# Create imported target hdf5_hl
  22 +ADD_LIBRARY(hdf5_hl STATIC IMPORTED)
  23 +
  24 +# Create imported target hdf5_f90cstub
  25 +ADD_LIBRARY(hdf5_f90cstub STATIC IMPORTED)
  26 +
  27 +# Create imported target hdf5_fortran
  28 +ADD_LIBRARY(hdf5_fortran STATIC IMPORTED)
  29 +
  30 +# Create imported target hdf5_cpp
  31 +ADD_LIBRARY(hdf5_cpp STATIC IMPORTED)
  32 +
  33 +# Load information for each installed configuration.
  34 +GET_FILENAME_COMPONENT(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
  35 +FILE(GLOB CONFIG_FILES "${_DIR}/hdf5-targets-*.cmake")
  36 +FOREACH(f ${CONFIG_FILES})
  37 +  INCLUDE(${f})
  38 +ENDFOREACH(f)
  39 +
  40 +# Commands beyond this point should not need to know the version.
  41 +SET(CMAKE_IMPORT_FILE_VERSION)
  42 +CMAKE_POLICY(POP)
  43 --- hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100
  44 +++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in      2013-04-02 18:12:17.399383569 +0200
  45 @@ -0,0 +1,93 @@
  46 +#----------------------------------------------------------------
  47 +# Generated CMake target import file for configuration "".
  48 +#----------------------------------------------------------------
  49 +
  50 +# Commands may need to know the format version.
  51 +SET(CMAKE_IMPORT_FILE_VERSION 1)
  52 +
  53 +# Compute the installation prefix relative to this file.
  54 +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
  55 +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
  56 +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
  57 +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
  58 +
  59 +# Make sure the targets which have been exported in some other
  60 +# export set exist.
  61 +
  62 +# Import target "hdf5" for configuration ""
  63 +SET_PROPERTY(TARGET hdf5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
  64 +SET_TARGET_PROPERTIES(hdf5 PROPERTIES
  65 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C"
  66 +  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "m;sz"
  67 +  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so"
  68 +  )
  69 +
  70 +LIST(APPEND _IMPORT_CHECK_TARGETS hdf5 )
  71 +LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5 "${_IMPORT_PREFIX}/@lib@/libhdf5.so" )
  72 +
  73 +# Make sure the targets which have been exported in some other
  74 +# export set exist.
  75 +
  76 +# Import target "hdf5_hl" for configuration ""
  77 +SET_PROPERTY(TARGET hdf5_hl APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
  78 +SET_TARGET_PROPERTIES(hdf5_hl PROPERTIES
  79 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C"
  80 +  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "m;sz"
  81 +  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so"
  82 +  )
  83 +
  84 +#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_hl )
  85 +LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_hl "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so" )
  86 +
  87 +# Make sure the targets which have been exported in some other
  88 +# export set exist.
  89 +
  90 +# Import target "hdf5_fortran" for configuration ""
  91 +SET_PROPERTY(TARGET hdf5_fortran APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
  92 +SET_TARGET_PROPERTIES(hdf5_fortran PROPERTIES
  93 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "Fortran"
  94 +  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "hdf5_f90cstub;hdf5"
  95 +  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_fortran.so"
  96 +  )
  97 +
  98 +#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_fortran )
  99 +LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_fortran "${_IMPORT_PREFIX}/@lib@/libhdf5_fortran.so" )
 100 +
 101 +# Make sure the targets which have been exported in some other
 102 +# export set exist.
 103 +
 104 +# Import target "hdf5_cpp" for configuration ""
 105 +SET_PROPERTY(TARGET hdf5_cpp APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 106 +SET_TARGET_PROPERTIES(hdf5_cpp PROPERTIES
 107 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
 108 +  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "hdf5"
 109 +  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so"
 110 +  )
 111 +
 112 +#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_cpp )
 113 +LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_cpp "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so" )
 114 +
 115 +# Loop over all imported files and verify that they actually exist
 116 +FOREACH(target ${_IMPORT_CHECK_TARGETS} )
 117 +  FOREACH(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
 118 +    IF(NOT EXISTS "${file}" )
 119 +      MESSAGE(FATAL_ERROR "The imported target \"${target}\" references the file
 120 +   \"${file}\"
 121 +but this file does not exist.  Possible reasons include:
 122 +* The file was deleted, renamed, or moved to another location.
 123 +* An install or uninstall procedure did not complete successfully.
 124 +* The installation package was faulty and contained
 125 +   \"${CMAKE_CURRENT_LIST_FILE}\"
 126 +but not all the files it references.
 127 +")
 128 +    ENDIF()
 129 +  ENDFOREACH()
 130 +  UNSET(_IMPORT_CHECK_FILES_FOR_${target})
 131 +ENDFOREACH()
 132 +UNSET(_IMPORT_CHECK_TARGETS)
 133 +
 134 +# Cleanup temporary variables.
 135 +SET(_IMPORT_PREFIX)
 136 +
 137 +# Commands beyond this point should not need to know the version.
 138 +SET(CMAKE_IMPORT_FILE_VERSION)
 139 --- hdf5-1.8.15/config/cmake/hdf5-config.cmake.in~      2015-05-01 20:36:45.000000000 +0200
 140 +++ hdf5-1.8.15/config/cmake/hdf5-config.cmake.in       2015-07-13 22:14:01.374454258 +0200
 141 @@ -1,7 +1,6 @@
 142  #-----------------------------------------------------------------------------
 143  # HDF5 Config file for compiling against hdf5 build/install directory
 144  #-----------------------------------------------------------------------------
 145 -@PACKAGE_INIT@
 146
 147  string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
 148
 149 @@ -45,7 +45,7 @@
 150  set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH}")
 151
 152  set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
 153 -set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
 154 +set (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
 155
 156  if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
 157    set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@")
 158 @@ -65,7 +65,7 @@
 159
 160  if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
 161    set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
 162 -  set_and_check (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
 163 +  set (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
 164  endif ()
 165
 166  if (HDF5_BUILD_SHARED_LIBS)
 167 @@ -141,6 +141,3 @@
 168        endif ()
 169      endif ()
 170    endforeach ()
 171 -
 172 -  check_required_components(${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
 173 -
 174 \ No newline at end of file