- updated to 1.8.16 (note: new c++ libs sonames)

[packages/hdf5.git] / hdf5-cmake.patch

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index bc221590fab61c8e3211ef81cf4f72d3a9480d09..4054671a0a3fc91a8b302993cea4d4003194e91e 100644 (file)
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -1,6 +1,6 @@
 --- hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100
 +++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in      2013-04-02 18:10:51.166052034 +0200
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,39 @@
 +# Generated by CMake 2.8.10.2
 +
 +IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
@@ -18,6 +18,9 @@
 +# Create imported target hdf5
 +ADD_LIBRARY(hdf5 STATIC IMPORTED)
 +
++# Create imported target hdf5_hl
++ADD_LIBRARY(hdf5_hl STATIC IMPORTED)
++
 +# Create imported target hdf5_f90cstub
 +ADD_LIBRARY(hdf5_f90cstub STATIC IMPORTED)
 +
@@ -39,7 +42,7 @@
 +CMAKE_POLICY(POP)
 --- hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in.orig        1970-01-01 01:00:00.000000000 +0100
 +++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in     2013-04-02 18:12:17.399383569 +0200
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,93 @@
 +#----------------------------------------------------------------
 +# Generated CMake target import file for configuration "".
 +#----------------------------------------------------------------
@@ -70,6 +73,20 @@
 +# Make sure the targets which have been exported in some other 
 +# export set exist.
 +
++# Import target "hdf5_hl" for configuration ""
++SET_PROPERTY(TARGET hdf5_hl APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++SET_TARGET_PROPERTIES(hdf5_hl PROPERTIES
++  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C"
++  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "m;sz"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so"
++  )
++
++#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_hl )
++LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_hl "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so" )
++
++# Make sure the targets which have been exported in some other 
++# export set exist.
++
 +# Import target "hdf5_fortran" for configuration ""
 +SET_PROPERTY(TARGET hdf5_fortran APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +SET_TARGET_PROPERTIES(hdf5_fortran PROPERTIES
@@ -119,3 +136,39 @@
 +
 +# Commands beyond this point should not need to know the version.
 +SET(CMAKE_IMPORT_FILE_VERSION)
+--- hdf5-1.8.16/config/cmake/hdf5-config.cmake.in.orig 2015-10-24 07:14:03.000000000 +0200
++++ hdf5-1.8.16/config/cmake/hdf5-config.cmake.in      2015-11-26 21:14:53.838328233 +0100
+@@ -1,7 +1,6 @@
+ #-----------------------------------------------------------------------------
+ # HDF5 Config file for compiling against hdf5 build/install directory
+ #-----------------------------------------------------------------------------
+-@PACKAGE_INIT@
+ 
+ string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
+ 
+@@ -47,7 +46,7 @@
+ set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH}")
+ 
+ set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
+-set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
++set (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
+ 
+ if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
+   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
+@@ -63,7 +62,7 @@
+ 
+ if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
+   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-  set_and_check (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
++  set (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
+ endif ()
+ 
+ #-----------------------------------------------------------------------------
+@@ -154,7 +153,3 @@
+     endif ()
+   endforeach ()
+ endforeach ()
+-
+-foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE)
+-  check_required_components(${HDF5_PACKAGE_NAME}_${libtype})
+-endforeach ()