Merge pull request #2495 from albertziegenhagel/hdf5-1.10.1

[hdf5] Update to 1.10.1
2024-11-27 04:19:00 +08:00 · 2018-01-03 15:30:34 +02:00 · 2018-01-03 15:30:34 +02:00 · cd45f25ea5
commit cd45f25ea5
parent c3a6f18eb9 7d48a73928
4 changed files with 78 additions and 57 deletions
--- a/ports/hdf5/CONTROL
+++ b/ports/hdf5/CONTROL
@ -1,4 +1,4 @@
 Source: hdf5
-Version: 1.10.0-patch1-2
+Version: 1.10.1
 Description: HDF5 is a data model, library, and file format for storing and managing data
 Build-Depends: zlib, szip, msmpi
--- a/ports/hdf5/disable-static-libs.patch
+++ b/ports/hdf5/disable-static-libs.patch
@ -1,12 +1,10 @@
-diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
-index 872e42d..146d0a9 100644
--- a/hl/src/CMakeLists.txt
-+++ b/hl/src/CMakeLists.txt
-@@ -29,16 +29,20 @@ set (HL_HEADERS
+--- a/hl/src/CMakeLists.txt	Thu Apr 13 18:26:10 2017
+++ b/hl/src/CMakeLists.txt	Wed Jan 03 13:13:06 2018
+@@ -29,16 +29,20 @@
     ${HDF5_HL_SRC_SOURCE_DIR}/hdf5_hl.h
 )
 
-add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SRCS} ${HL_HEADERS})
+-add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS})
 -TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC " " " ")
 -target_link_libraries (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
 -H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} STATIC)
@ -19,7 +17,7 @@ index 872e42d..146d0a9 100644
 +set (install_targets)
 +
 +if (NOT DISABLE_STATIC_LIBS)
-+  add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SRCS} ${HL_HEADERS})
+  add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS})
 +  TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC " " " ")
 +  target_link_libraries (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
 +  H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} STATIC)
@ -28,16 +26,25 @@ index 872e42d..146d0a9 100644
 +      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 +  )
 +  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}")
-+  set (install_targets ${install_targets} ${HDF5_HL_LIB_TARGET})
-+endif (NOT DISABLE_STATIC_LIBS)
+  set (install_targets ${HDF5_HL_LIB_TARGET})
+endif ()
 
 if (BUILD_SHARED_LIBS)
-   add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SRCS} ${HL_HEADERS})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d93612b..a63cc3a 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -851,30 +851,33 @@ add_custom_command (
+   add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS})
+@@ -73,8 +77,9 @@
+ if (HDF5_EXPORTED_TARGETS)
+   if (BUILD_SHARED_LIBS)
+     INSTALL_TARGET_PDB (${HDF5_HL_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
+  else ()
+    INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
+   endif ()
+-  INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
+ 
+   install (
+       TARGETS
+--- a/src/CMakeLists.txt	Thu Apr 13 18:26:11 2017
+++ b/src/CMakeLists.txt	Wed Jan 03 13:03:05 2018
+@@ -876,30 +876,33 @@
 #-----------------------------------------------------------------------------
 set (gen_SRCS ${HDF5_BINARY_DIR}/H5Tinit.c ${HDF5_BINARY_DIR}/H5lib_settings.c)
 
@ -45,46 +52,62 @@ index d93612b..a63cc3a 100644
 -TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ")
 -target_link_libraries (${HDF5_LIB_TARGET} ${LINK_LIBS})
 -if (NOT WIN32)
-+set (install_targets)
-+if (NOT DISABLE_STATIC_LIBS)
-+  add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS})
-+  TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ")
-+  target_link_libraries (${HDF5_LIB_TARGET} ${LINK_LIBS})
-+  if (NOT WIN32)
-   target_link_libraries (${HDF5_LIB_TARGET} dl)
-endif (NOT WIN32)
+-  target_link_libraries (${HDF5_LIB_TARGET} dl)
+-endif ()
 -if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-+  endif (NOT WIN32)
-+  if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-   target_link_libraries (${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
-endif (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+-  target_link_libraries (${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
+-endif ()
 -set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
 -H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC)
 -set_target_properties (${HDF5_LIB_TARGET} PROPERTIES
 -    FOLDER libraries
 -    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 -)
-+  endif (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
-+  H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC)
-+  set_target_properties (${HDF5_LIB_TARGET} PROPERTIES
-+      FOLDER libraries
-+      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-+  )
- 
+-
 -option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF)
 -if (HDF5_ENABLE_DEBUG_APIS)
+set (install_targets)
+if (NOT DISABLE_STATIC_LIBS)
+  add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS})
+  TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ")
+  target_link_libraries (${HDF5_LIB_TARGET} ${LINK_LIBS})
+  if (NOT WIN32)
+    target_link_libraries (${HDF5_LIB_TARGET} dl)
+  endif ()
+  if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+    target_link_libraries (${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
+  endif ()
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
+  H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC)
+   set_target_properties (${HDF5_LIB_TARGET} PROPERTIES
+-      COMPILE_DEFINITIONS
+-          "H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG"
+      FOLDER libraries
+      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+   )
+
 +  option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF)
 +  if (HDF5_ENABLE_DEBUG_APIS)
-   set_target_properties (${HDF5_LIB_TARGET} PROPERTIES
-       COMPILE_DEFINITIONS
-           "H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG"
-   )
-endif (HDF5_ENABLE_DEBUG_APIS)
+    set_target_properties (${HDF5_LIB_TARGET} PROPERTIES
+        COMPILE_DEFINITIONS
+            "H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG"
+    )
+  endif ()
+  set (install_targets ${HDF5_LIB_TARGET})
+ endif ()
 -set (install_targets ${HDF5_LIB_TARGET})
-+  endif (HDF5_ENABLE_DEBUG_APIS)
-+  set (install_targets ${install_targets} ${HDF5_LIB_TARGET})
-+endif (NOT DISABLE_STATIC_LIBS)
 
 if (BUILD_SHARED_LIBS)
   file (MAKE_DIRECTORY "${HDF5_BINARY_DIR}/shared")
+@@ -975,8 +978,10 @@
+ if (HDF5_EXPORTED_TARGETS)
+   if (BUILD_SHARED_LIBS)
+     INSTALL_TARGET_PDB (${HDF5_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} libraries)
+  else ()
+    INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} libraries)
+   endif ()
+-  INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} libraries)
+  
+ 
+   install (
+       TARGETS
--- a/ports/hdf5/link-libraries-private.patch
+++ b/ports/hdf5/link-libraries-private.patch
@ -1,8 +1,6 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a63cc3a..aea963d 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -900,12 +900,12 @@ if (BUILD_SHARED_LIBS)
+--- a/src/CMakeLists.txt	Wed Jan 03 13:16:33 2018
+++ b/src/CMakeLists.txt	Wed Jan 03 13:16:56 2018
+@@ -925,12 +925,12 @@
   set (shared_gen_SRCS ${HDF5_BINARY_DIR}/shared/H5Tinit.c ${HDF5_BINARY_DIR}/shared/H5lib_settings.c)
   add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${shared_gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS})
   TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ")
@ -11,19 +9,19 @@ index a63cc3a..aea963d 100644
   if (NOT WIN32)
 -    target_link_libraries (${HDF5_LIBSH_TARGET} dl)
 +    target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE dl)
-   endif (NOT WIN32)
+   endif ()
   if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
 -    target_link_libraries (${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES})
 +    target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE ${MPI_C_LIBRARIES})
-   endif (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+   endif ()
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
-@@ -920,7 +920,7 @@ if (BUILD_SHARED_LIBS)
+@@ -945,7 +945,7 @@
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
 -    target_link_libraries (${HDF5_LIBSH_TARGET} Threads::Threads)
 +    target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE Threads::Threads)
-   endif (HDF5_ENABLE_THREADSAFE)
+   endif ()
 
   if (HDF5_ENABLE_DEBUG_APIS)
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@ -3,11 +3,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()

 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CMake-hdf5-1.10.0-patch1/hdf5-1.10.0-patch1)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CMake-hdf5-1.10.1/hdf5-1.10.1)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://hdf4.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/CMake-hdf5-1.10.0-patch1.zip"
-    FILENAME "CMake-hdf5-1.10.0-patch1.zip"
-    SHA512 ec2edb43438661323be5998ecf64c4dd537ddc7451e31f89390260d16883e60a1ccc1bf745bcb809af22f2bf7157d50331a33910b8ebf5c59cd50693dfb2ef8f
+    URLS "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/CMake-hdf5-1.10.1.zip"
+    FILENAME "CMake-hdf5-1.10.1.zip"
+    SHA512 0045a6301c6e3479be70f025d8690297ff33b9e6e99ec217a33e9b916d9410fb3f7110b7361fbeaec163c35b8e6bd948ac8d5fdace80930c98c6a0b27c6fd5c4
 )
 vcpkg_extract_source_archive(${ARCHIVE})