Add option to use zlib-ng as zlib library

.github/workflows/main-cmake-spc.yml

@@ -80,7 +80,7 @@ jobs:
 #        working-directory: ${{ runner.workspace }}/build
 
   build_v1_10:
-    name: "gcc DBG v1.10 default API (build only)"
+    name: "gcc DBG v1.10 default API"
     runs-on: ubuntu-latest
     steps:
       # SETUP
@@ -140,7 +140,7 @@ jobs:
         working-directory: ${{ runner.workspace }}/build
 
   build_v1_12:
-    name: "gcc DBG v1.12 default API (build only)"
+    name: "gcc DBG v1.12 default API"
     runs-on: ubuntu-latest
     steps:
       # SETUP
@@ -199,21 +199,21 @@ jobs:
         run: ctest . --parallel 2 -C Debug -V
         working-directory: ${{ runner.workspace }}/build
 
-  build_v1_14:
-    name: "gcc DBG v1.14 default API (build only)"
+  build_zlibng:
+    name: "gcc use zlib-ng filter"
     runs-on: ubuntu-latest
     steps:
       # SETUP
       - name: Install Linux Dependencies
         run: |
-           sudo apt-get update
-           sudo apt-get install ninja-build doxygen graphviz
-           sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
-           sudo apt install gcc-12 g++-12 gfortran-12
-           echo "CC=gcc-12" >> $GITHUB_ENV
-           echo "CXX=g++-12" >> $GITHUB_ENV
-           echo "FC=gfortran-12" >> $GITHUB_ENV
- 
+          sudo apt-get update
+          sudo apt-get install ninja-build doxygen graphviz
+          sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
+          sudo apt install gcc-12 g++-12 gfortran-12
+          echo "CC=gcc-12" >> $GITHUB_ENV
+          echo "CXX=g++-12" >> $GITHUB_ENV
+          echo "FC=gfortran-12" >> $GITHUB_ENV
+
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Get Sources
         uses: actions/checkout@v4.1.1
@@ -227,34 +227,33 @@ jobs:
           cd "${{ runner.workspace }}/build"
           cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
             -G Ninja \
-            -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_BUILD_TYPE=Release \
             -DBUILD_SHARED_LIBS=ON \
             -DHDF5_ENABLE_ALL_WARNINGS=ON \
             -DHDF5_ENABLE_PARALLEL:BOOL=OFF \
             -DHDF5_BUILD_CPP_LIB:BOOL=ON \
             -DHDF5_BUILD_FORTRAN=ON \
             -DHDF5_BUILD_JAVA=ON \
             -DHDF5_BUILD_DOC=OFF \
-            -DLIBAEC_USE_LOCALCONTENT=OFF \
-            -DZLIB_USE_LOCALCONTENT=OFF \
+            -DLIBAEC_USE_LOCALCONTENT=ON \
+            -DZLIB_USE_LOCALCONTENT=ON \
             -DHDF5_ENABLE_MIRROR_VFD:BOOL=ON \
             -DHDF5_ENABLE_DIRECT_VFD:BOOL=ON \
             -DHDF5_ENABLE_ROS3_VFD:BOOL=ON \
-            -DH5_NO_DEPRECATED_SYMBOLS:BOOL=OFF \
-            -DDEFAULT_API_VERSION:STRING=v114 \
+            -DHDF5_USE_ZLIBNG:BOOL=ON \
             $GITHUB_WORKSPACE
         shell: bash
 
       #
       # BUILD
       #
       - name: CMake Build
-        run: cmake --build . --parallel 3 --config Debug
+        run: cmake --build . --parallel 3 --config Release
         working-directory: ${{ runner.workspace }}/build
 
       #
       # RUN TESTS
       #
       - name: CMake Run Tests
-        run: ctest . --parallel 2 -C Debug -V
+        run: ctest . --parallel 2 -C Release -V
         working-directory: ${{ runner.workspace }}/build

CMakeFilters.cmake

@@ -9,14 +9,23 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-option (USE_LIBAEC_STATIC "Use static AEC library" OFF)
-option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB else search" OFF)
-option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP else search" OFF)
+option (HDF5_USE_ZLIB_NG "Use zlib-ng library as zlib library" OFF)
+option (HDF5_USE_LIBAEC_STATIC "Use 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)
 
 if (NOT ZLIB_USE_LOCALCONTENT)
-  set (ZLIB_URL ${ZLIB_TGZ_ORIGPATH}/${ZLIB_TGZ_NAME})
+  if (HDF5_USE_ZLIB_NG)
+    set (ZLIB_URL ${ZLIBNG_TGZ_ORIGPATH}/${ZLIBNG_TGZ_NAME})
+  else ()
+    set (ZLIB_URL ${ZLIB_TGZ_ORIGPATH}/${ZLIB_TGZ_NAME})
+  endif ()
 else ()
-  set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
+  if (HDF5_USE_ZLIB_NG)
+    set (ZLIB_URL ${TGZPATH}/${ZLIBNG_TGZ_NAME})
+  else ()
+    set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
+  endif ()
 endif ()
 message (VERBOSE "Filter ZLIB file is ${ZLIB_URL}")
 
@@ -71,8 +80,13 @@ option (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" ON)
 if (HDF5_ENABLE_Z_LIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
+      if (HDF5_USE_ZLIB_NG)
+        set (PACKAGE_NAME ${ZLIBNG_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+      else ()
+        set (PACKAGE_NAME ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+      endif ()
       set(ZLIB_FOUND FALSE)
-      find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+      find_package (ZLIB NAMES ${PACKAGE_NAME} COMPONENTS static shared)
       if (NOT ZLIB_FOUND)
         find_package (ZLIB) # Legacy find
       endif ()
@@ -119,9 +133,14 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
   if (NOT SZIP_USE_EXTERNAL)
     set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
     set(SZIP_FOUND FALSE)
-    find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-    if (NOT SZIP_FOUND)
-      find_package (SZIP) # Legacy find
+    find_package (libaec 1.0.5 CONFIG)
+    if (SZIP_FOUND)
+      set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${H5_SZIP_LIBRARIES})
+    else ()
+      find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+      if (NOT SZIP_FOUND)
+        find_package (SZIP) # Legacy find
+      endif ()
     endif ()
     set(H5_SZIP_FOUND ${SZIP_FOUND})
     if (H5_SZIP_FOUND)

CMakePresets.json

@@ -20,9 +20,12 @@
         "ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
         "ZLIB_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/madler/zlib/releases/download/v1.3"},
         "ZLIB_TGZ_NAME": {"type": "STRING", "value": "zlib-1.3.tar.gz"},
+        "ZLIBNG_PACKAGE_NAME": {"type": "STRING", "value": "zlib-ng"},
+        "ZLIBNG_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/zlib-ng/zlib-ng/archive/refs/tags"},
+        "ZLIBNG_TGZ_NAME": {"type": "STRING", "value": "2.1.6.tar.gz"},
         "LIBAEC_PACKAGE_NAME": {"type": "STRING", "value": "libaec"},
-        "LIBAEC_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/MathisRosenhauer/libaec/releases/download/v1.0.6"},
-        "LIBAEC_TGZ_NAME": {"type": "STRING", "value": "libaec-1.0.6.tar.gz"}
+        "LIBAEC_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/MathisRosenhauer/libaec/releases/download/v1.1.3"},
+        "LIBAEC_TGZ_NAME": {"type": "STRING", "value": "libaec-1.1.3.tar.gz"}
       }
     },
     {
@@ -31,6 +34,7 @@
       "inherits": ["ci-base-tgz", "ci-CompressionVars"],
       "cacheVariables": {
         "HDF5_PACKAGE_EXTLIBS": "ON",
+        "HDF5_USE_ZLIB_NG": "OFF",
         "ZLIB_USE_LOCALCONTENT": "OFF",
         "LIBAEC_USE_LOCALCONTENT": "OFF"
       }

config/cmake/HDFLibMacros.cmake

@@ -28,7 +28,11 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
     FetchContent_Populate(HDF5_ZLIB)
 
     # Copy an additional/replacement files into the populated source
-    file(COPY ${HDF_RESOURCES_DIR}/ZLIB/CMakeLists.txt DESTINATION ${hdf5_zlib_SOURCE_DIR})
+    if (HDF5_USE_ZLIB_NG)
+      file(COPY ${HDF_RESOURCES_DIR}/ZLIBNG/CMakeLists.txt DESTINATION ${hdf5_zlib_SOURCE_DIR})
+    else ()
+      file(COPY ${HDF_RESOURCES_DIR}/ZLIB/CMakeLists.txt DESTINATION ${hdf5_zlib_SOURCE_DIR})
+    endif ()
 
     add_subdirectory(${hdf5_zlib_SOURCE_DIR} ${hdf5_zlib_BINARY_DIR})
   endif()