- rediffed cmake patch with fuzz 0

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

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 0b683b4abfc6d208d33bd4cdf00390dbe7bcb8ce..e8c78b0581c3a96d431c1a81fb9ac225b4d7be53 100644 (file)
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -12,7 +12,6 @@
  #-----------------------------------------------------------------------------
  # HDF5 Config file for compiling against hdf5 build/install directory
  #-----------------------------------------------------------------------------
@@ -8,8 +8,8 @@
  
  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}")
+@@ -79,7 +78,7 @@
+ set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_DIRS}")
  
  set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
 -set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
@@ -17,7 +17,7 @@
  
  if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
    set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
-@@ -63,7 +62,7 @@
+@@ -95,7 +94,7 @@
  
  if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
    set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
@@ -26,7 +26,7 @@
  endif ()
  
  #-----------------------------------------------------------------------------
-@@ -154,7 +153,3 @@
+@@ -205,7 +204,3 @@
      endif ()
    endforeach ()
  endforeach ()
@@ -36,7 +36,7 @@
 -endforeach ()
 --- hdf5-1.8.20/config/cmake/hdf5-targets.cmake.in.orig        1970-01-01 01:00:00.000000000 +0100
 +++ hdf5-1.8.20/config/cmake/hdf5-targets.cmake.in     2018-05-09 18:50:11.684497207 +0200
-@@ -0,0 +1,217 @@
+@@ -0,0 +1,218 @@
 +# Generated by CMake
 +
 +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
@@ -84,6 +84,7 @@
 +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
 +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 +if(_IMPORT_PREFIX STREQUAL "/")
 +  set(_IMPORT_PREFIX "")
 +endif()
@@ -277,12 +278,12 @@
 +# Import target "hdf5::hdf5-shared" for configuration ""
 +set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +set_target_properties(hdf5::hdf5-shared PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.1.8.20"
-+  IMPORTED_SONAME_NOCONFIG "libhdf5.so.10.3.1"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.2.0"
++  IMPORTED_SONAME_NOCONFIG "libhdf5.so.103"
 +  )
 +
 +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5-shared )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5-shared "${_IMPORT_PREFIX}/@lib@/libhdf5.so.1.8.20" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5-shared "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103" )
 +
 +# Import target "hdf5::hdf5_tools-static" for configuration ""
 +set_property(TARGET hdf5::hdf5_tools-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
@@ -297,12 +298,12 @@
 +# Import target "hdf5::hdf5_tools-shared" for configuration ""
 +set_property(TARGET hdf5::hdf5_tools-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +set_target_properties(hdf5::hdf5_tools-shared PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.1.8.20"
-+  IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.10.3.1"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.3.0"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.103"
 +  )
 +
 +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-shared )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.1.8.20" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.3.0" )
 +
 +# Import target "hdf5::h5diff" for configuration ""
 +set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
@@ -479,12 +480,12 @@
 +# Import target "hdf5::hdf5_hl-shared" for configuration ""
 +set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +set_target_properties(hdf5::hdf5_hl-shared PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.1.8.20"
-+  IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.10.3.1"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.4"
 +  )
 +
 +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.1.8.20" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" )
 +
 +# Import target "hdf5::gif2h5" for configuration ""
 +set_property(TARGET hdf5::gif2h5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
@@ -517,12 +518,12 @@
 +# Import target "hdf5::hdf5_cpp-shared" for configuration ""
 +set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.1.8.20"
-+  IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.10.3.1"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.3.0"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103"
 +  )
 +
 +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_cpp-shared )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_cpp-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.1.8.20" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_cpp-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103" )
 +
 +# Import target "hdf5::hdf5_hl_cpp-static" for configuration ""
 +set_property(TARGET hdf5::hdf5_hl_cpp-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
@@ -537,12 +538,12 @@
 +# Import target "hdf5::hdf5_hl_cpp-shared" for configuration ""
 +set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.1.8.20"
-+  IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.10.3.1"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.5"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100"
 +  )
 +
 +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl_cpp-shared )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl_cpp-shared "${_IMPORT_PREFIX}/lib/libhdf5_hl_cpp-shared.so.1.8.20" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl_cpp-shared "${_IMPORT_PREFIX}/lib/libhdf5_hl_cpp-shared.so.100" )
 +
 +# Commands beyond this point should not need to know the version.
 +set(CMAKE_IMPORT_FILE_VERSION)