Merge remote-tracking branch 'origin/locking_protocol' into ts_h5fl_reg

.github/FUNDING.yml

@@ -1,3 +1 @@
 # These are supported funding model platforms
-
-custom: "https://www.hdfgroup.org/donate"

.github/workflows/aocc-cmake.yml

@@ -70,6 +70,7 @@ jobs:
           CC=mpicc cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_PARALLEL:BOOL=ON \
           -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \

.github/workflows/i386-cmake.yml

@@ -38,6 +38,7 @@ jobs:
           cmake -C ../config/cmake/cacheinit.cmake -G "Unix Makefiles" \
           --log-level=VERBOSE \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
           -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \

.github/workflows/julia-cmake.yml

@@ -34,6 +34,7 @@ jobs:
           cd "${{ runner.workspace }}/build"
           cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_PARALLEL:BOOL=OFF \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \

.github/workflows/netcdf.yml

@@ -52,6 +52,7 @@ jobs:
             -DHDF5_BUILD_DOC:BOOL=OFF \
             -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \
             -DZLIB_USE_LOCALCONTENT:BOOL=OFF \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \
             -DH5_NO_DEPRECATED_SYMBOLS:BOOL=OFF \
             -DBUILD_TESTING:BOOL=OFF \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \

.github/workflows/nvhpc-cmake.yml

@@ -52,6 +52,7 @@ jobs:
           cd "${{ runner.workspace }}/build"
           cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_PARALLEL:BOOL=ON \
           -DMPIEXEC_NUMPROC_FLAG:STRING=-np \

.github/workflows/vol_adios2.yml

@@ -43,6 +43,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             ${{ github.workspace }}/hdf5
           cat src/libhdf5.settings

.github/workflows/vol_async.yml

@@ -55,6 +55,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/HDFGroup/vol-async.git" \

.github/workflows/vol_cache.yml

@@ -83,6 +83,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/HDFGroup/vol-async.git" \

.github/workflows/vol_ext_passthru.yml

@@ -42,6 +42,7 @@ jobs:
             -DBUILD_STATIC_LIBS=OFF \
             -DHDF5_TEST_API:BOOL=ON \
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/hpc-io/vol-external-passthrough.git" \

.github/workflows/vol_log.yml

@@ -41,6 +41,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             ${{ github.workspace }}/hdf5
           cat src/libhdf5.settings

.github/workflows/vol_rest.yml

@@ -57,8 +57,8 @@ jobs:
             -DHDF5_BUILD_HL_LIB:BOOL=ON \
             -DHDF5_TEST_API:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
-            -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
+            -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/HDFGroup/vol-rest.git" \
             -DHDF5_VOL_VOL-REST_BRANCH:STRING="master" \

CMakeFilters.cmake

@@ -14,6 +14,8 @@ option (HDF5_USE_ZLIB_STATIC "Find static zlib library" OFF)
 option (HDF5_USE_LIBAEC_STATIC "Find static AEC library" OFF)
 option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" OFF)
 option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" OFF)
+option (ZLIB_USE_LOCALCONTENT "Use local file for ZLIB FetchContent" OFF)
+option (LIBAEC_USE_LOCALCONTENT "Use local file for LIBAEC FetchContent" OFF)
 
 if (NOT ZLIB_USE_LOCALCONTENT)
   if (HDF5_USE_ZLIB_NG)
@@ -77,7 +79,13 @@ endif ()
 # Option for ZLib support
 #-----------------------------------------------------------------------------
 set(H5_ZLIB_FOUND FALSE)
-option (HDF5_ENABLE_ZLIB_SUPPORT "Enable Zlib Filters" ON)
+if(NOT DEFINED ZLIB_PACKAGE_NAME)
+  set(ZLIB_PACKAGE_NAME "zlib")
+endif ()
+if(NOT DEFINED ZLIBNG_PACKAGE_NAME)
+  set(ZLIBNG_PACKAGE_NAME "zlib-ng")
+endif ()
+option (HDF5_ENABLE_ZLIB_SUPPORT "Enable Zlib Filters" OFF)
 if (HDF5_ENABLE_ZLIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
@@ -88,11 +96,12 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
       endif ()
       set(ZLIB_FOUND FALSE)
       if (HDF5_USE_ZLIB_STATIC)
-        set(ZLIB_SEACH_TYPE static)
+        set(ZLIB_SEARCH_TYPE static)
       else ()
-        set(ZLIB_SEACH_TYPE shared)
+        set(ZLIB_SEARCH_TYPE shared)
       endif ()
-      find_package (ZLIB NAMES ${PACKAGE_NAME} COMPONENTS ${ZLIB_SEACH_TYPE})
+      # Search pure Config mode first
+      find_package (ZLIB NAMES ${PACKAGE_NAME} OPTIONAL_COMPONENTS ${ZLIB_SEARCH_TYPE})
       if (NOT ZLIB_FOUND)
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
           set(ZLIB_USE_STATIC_LIBS  ${HDF5_USE_ZLIB_STATIC})
@@ -140,7 +149,7 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
     message (VERBOSE "Filter HDF5_ZLIB is ON")
   else ()
     set (HDF5_ENABLE_ZLIB_SUPPORT OFF CACHE BOOL "" FORCE)
-    message (WARNING " ZLib support in HDF5 was enabled but not found")
+    message (FATAL_ERROR " ZLib support in HDF5 was enabled but not found")
   endif ()
   message(STATUS "H5_ZLIB_HEADER=${H5_ZLIB_HEADER}")
 endif ()
@@ -149,7 +158,10 @@ endif ()
 # Option for SzLib support
 #-----------------------------------------------------------------------------
 set(H5_SZIP_FOUND FALSE)
-option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" ON)
+if(NOT DEFINED LIBAEC_PACKAGE_NAME)
+  set(LIBAEC_PACKAGE_NAME "libaec")
+endif ()
+option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)
@@ -160,10 +172,8 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
     endif ()
     set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
     set(SZIP_FOUND FALSE)
-    find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS ${LIBAEC_SEARCH_TYPE})
-    if (NOT SZIP_FOUND)
-      find_package (SZIP) # Legacy find
-    endif ()
+    # Search pure Config mode, there is not a FindSZIP module available
+    find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} OPTIONAL_COMPONENTS ${LIBAEC_SEARCH_TYPE})
     set(H5_SZIP_FOUND ${SZIP_FOUND})
     if (H5_SZIP_FOUND)
       set (H5_SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
@@ -173,8 +183,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
   else ()
     if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
-      message (VERBOSE "Filter SZIP is built")
-      message (VERBOSE "... with library AEC")
+      message (VERBOSE "Filter SZIP is built using library AEC")
       set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${H5_SZIP_STATIC_LIBRARY})
     endif ()
   endif ()
@@ -193,6 +202,6 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
     endif ()
   else ()
     set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
-    message (WARNING "SZIP support in HDF5 was enabled but not found")
+    message (FATAL_ERROR "SZIP support in HDF5 was enabled but not found")
   endif ()
 endif ()

CMakePlugins.cmake

@@ -10,6 +10,7 @@
 # [email protected].
 #
 option (PLUGIN_USE_EXTERNAL "Use External Library Building for filter PLUGIN else search" OFF)
+option (PLUGIN_USE_LOCALCONTENT "Use local file for PLUGIN FetchContent" OFF)
 
 if (NOT PLUGIN_USE_LOCALCONTENT)
   set (PLUGIN_URL ${PLUGIN_TGZ_ORIGPATH}/${PLUGIN_TGZ_NAME})

README.md

@@ -89,7 +89,7 @@ are tentative.
 
 | Release | New Features |
 | ------- | ------------ |
-| 2.0.0 | Drop Autotools support, drop the C++ API, drop the HDF5 <--> GIF tools, add complex number support, update library defaults (cache sizes, etc.), use semantic versioning |
+| 2.0.0 | Drop Autotools support, drop the HDF5 <--> GIF tools, add complex number support, update library defaults (cache sizes, etc.), use semantic versioning |
 | FUTURE | Multi-threaded HDF5, crashproofing / metadata journaling, Full (VFD) SWMR, encryption, digital signatures, sparse datasets, improved storage for variable-length datatypes, better Unicode support (especially on Windows) |
 
 NOTE: In the March 2025 release we will begin using semantic versioning (https://semver.org/) and the previously announced 1.16.0 version will instead be numbered 2.0.0.