From 0c01767c4e9aa643d6f4f915ae276c2012d2bccb Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 30 Jan 2025 15:33:49 -0600 Subject: [PATCH] Native zlib-ng is not found by the CMake module, use config --- CMakeFilters.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 347ba5ac195..ce5e426a3c3 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -13,9 +13,13 @@ option (HDF5_USE_ZLIB_NG "Use zlib-ng library as zlib library" OFF) 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) +mark_as_advanced (ZLIB_USE_EXTERNAL) option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" OFF) +mark_as_advanced (SZIP_USE_EXTERNAL) option (ZLIB_USE_LOCALCONTENT "Use local file for ZLIB FetchContent" OFF) +mark_as_advanced (ZLIB_USE_LOCALCONTENT) option (LIBAEC_USE_LOCALCONTENT "Use local file for LIBAEC FetchContent" OFF) +mark_as_advanced (LIBAEC_USE_LOCALCONTENT) if (NOT ZLIB_USE_LOCALCONTENT) if (HDF5_USE_ZLIB_NG) @@ -89,7 +93,9 @@ if (HDF5_ENABLE_ZLIB_SUPPORT) if (NOT H5_ZLIB_HEADER) if (NOT ZLIB_USE_EXTERNAL) option (HDF5_MODULE_MODE_ZLIB "Find the default system ZLIB in module mode" ON) + mark_as_advanced (HDF5_MODULE_MODE_ZLIB) if (HDF5_USE_ZLIB_NG) + set (HDF5_MODULE_MODE_ZLIB OFF CACHE BOOL "" FORCE) set (PACKAGE_NAME ${ZLIBNG_PACKAGE_NAME}${HDF_PACKAGE_EXT}) else () set (PACKAGE_NAME ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT})