- updated to 1.10.10; gif2h5/h52gif removed (deprecated and disabled by default,...

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

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 90fcbaf105778df0b3726114390beb61ad2cab4c..d0ee001d7a957c674bcd5ee0d6ec3c6a6c1a6f22 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 @@
+--- hdf5-1.10.9/config/cmake/hdf5-config.cmake.in.orig 2022-05-19 05:31:38.000000000 +0200
++++ hdf5-1.10.9/config/cmake/hdf5-config.cmake.in      2023-02-18 15:06:15.857876492 +0100
+@@ -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}")
+@@ -81,7 +80,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 @@
+@@ -97,7 +96,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 @@
+@@ -208,7 +207,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,218 @@
+@@ -0,0 +1,212 @@
 +# Generated by CMake
 +
 +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
@@ -55,7 +55,7 @@
 +set(_targetsDefined)
 +set(_targetsNotDefined)
 +set(_expectedTargets)
-+foreach(_expectedTarget hdf5::hdf5-static hdf5::hdf5-shared hdf5::hdf5_tools-static hdf5::hdf5_tools-shared hdf5::h5diff hdf5::h5diff-shared hdf5::h5ls hdf5::h5ls-shared hdf5::h5debug hdf5::h5repart hdf5::h5mkgrp hdf5::h5import hdf5::h5repack hdf5::h5repack-shared hdf5::h5jam hdf5::h5unjam hdf5::h5copy hdf5::h5copy-shared hdf5::h5stat hdf5::h5stat-shared hdf5::h5dump hdf5::h5dump-shared hdf5::hdf5_hl-static hdf5::hdf5_hl-shared hdf5::gif2h5 hdf5::h52gif hdf5::hdf5_cpp-static hdf5::hdf5_cpp-shared hdf5::hdf5_hl_cpp-static hdf5::hdf5_hl_cpp-shared)
++foreach(_expectedTarget hdf5::hdf5-static hdf5::hdf5-shared hdf5::hdf5_tools-static hdf5::hdf5_tools-shared hdf5::h5diff hdf5::h5diff-shared hdf5::h5ls hdf5::h5ls-shared hdf5::h5debug hdf5::h5repart hdf5::h5mkgrp hdf5::h5import hdf5::h5repack hdf5::h5repack-shared hdf5::h5jam hdf5::h5unjam hdf5::h5copy hdf5::h5copy-shared hdf5::h5stat hdf5::h5stat-shared hdf5::h5dump hdf5::h5dump-shared hdf5::hdf5_hl-static hdf5::hdf5_hl-shared hdf5::hdf5_cpp-static hdf5::hdf5_cpp-shared hdf5::hdf5_hl_cpp-static hdf5::hdf5_hl_cpp-shared)
 +  list(APPEND _expectedTargets ${_expectedTarget})
 +  if(NOT TARGET ${_expectedTarget})
 +    list(APPEND _targetsNotDefined ${_expectedTarget})
@@ -194,12 +194,6 @@
 +  INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared"
 +)
 +
-+# Create imported target hdf5::gif2h5
-+add_executable(hdf5::gif2h5 IMPORTED)
-+
-+# Create imported target hdf5::h52gif
-+add_executable(hdf5::h52gif IMPORTED)
-+
 +# Create imported target hdf5::hdf5_cpp-static
 +add_library(hdf5::hdf5_cpp-static STATIC IMPORTED)
 +
@@ -257,7 +251,7 @@
 +cmake_policy(POP)
 --- hdf5-1.8.20/config/cmake/hdf5-targets-noconfig.cmake.in.orig       1970-01-01 01:00:00.000000000 +0100
 +++ hdf5-1.8.20/config/cmake/hdf5-targets-noconfig.cmake.in    2018-05-09 18:54:57.997827272 +0200
-@@ -0,0 +1,289 @@
+@@ -0,0 +1,271 @@
 +#----------------------------------------------------------------
 +# Generated CMake target import file.
 +#----------------------------------------------------------------
@@ -278,7 +272,7 @@
 +# 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.103.2.0"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.4.0"
 +  IMPORTED_SONAME_NOCONFIG "libhdf5.so.103"
 +  )
 +
@@ -298,12 +292,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.103.2.0"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.4.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.103.2.0" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.4.0" )
 +
 +# Import target "hdf5::h5diff" for configuration ""
 +set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
@@ -481,30 +475,12 @@
 +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.100"
-+  IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.3"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.7"
 +  )
 +
 +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.100" )
 +
-+# Import target "hdf5::gif2h5" for configuration ""
-+set_property(TARGET hdf5::gif2h5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+set_target_properties(hdf5::gif2h5 PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/gif2h5"
-+  )
-+
-+list(APPEND _IMPORT_CHECK_TARGETS hdf5::gif2h5 )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::gif2h5 "${_IMPORT_PREFIX}/bin/gif2h5" )
-+
-+# Import target "hdf5::h52gif" for configuration ""
-+set_property(TARGET hdf5::h52gif APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+set_target_properties(hdf5::h52gif PROPERTIES
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h52gif"
-+  )
-+
-+list(APPEND _IMPORT_CHECK_TARGETS hdf5::h52gif )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h52gif "${_IMPORT_PREFIX}/bin/h52gif" )
-+
 +# Import target "hdf5::hdf5_cpp-static" for configuration ""
 +set_property(TARGET hdf5::hdf5_cpp-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 +set_target_properties(hdf5::hdf5_cpp-static PROPERTIES
@@ -518,7 +494,7 @@
 +# 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.103.2.0"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.4.2"
 +  IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103"
 +  )
 +
@@ -538,7 +514,7 @@
 +# 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.100.1.4"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.8"
 +  IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100"
 +  )
 +