system compress libs add dependency to the install (#5547)

Author: byrnHDF

CMakeFilters.cmake

@@ -99,26 +99,26 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
       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})
+        set (Z_PACKAGE_NAME ${ZLIBNG_PACKAGE_NAME}${HDF_PACKAGE_EXT})
       else ()
-        set (PACKAGE_NAME ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+        set (Z_PACKAGE_NAME ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT})
       endif ()
       set(ZLIB_FOUND FALSE)
-      message (VERBOSE "Filter HDF5_ZLIB package name:${PACKAGE_NAME}")
+      message (VERBOSE "Filter HDF5_ZLIB package name:${Z_PACKAGE_NAME}")
       if (HDF5_MODULE_MODE_ZLIB)
         # Expect that the default shared library is expected with FindZLIB.cmake
         find_package (ZLIB MODULE)
       else ()
         # Expect that a correctly built library with CMake config files is available
         if (HDF5_USE_ZLIB_STATIC)
-          set(ZLIB_SEARCH_TYPE static)
+          set(ZLIB_SEARCH_TYPE "static")
           if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
             set(ZLIB_USE_STATIC_LIBS  ${HDF5_USE_ZLIB_STATIC})
           endif()
         else ()
-          set(ZLIB_SEARCH_TYPE shared)
+          set(ZLIB_SEARCH_TYPE "shared")
         endif ()
-        find_package (ZLIB NAMES ${PACKAGE_NAME} CONFIG OPTIONAL_COMPONENTS ${ZLIB_SEARCH_TYPE})
+        find_package (ZLIB NAMES ${Z_PACKAGE_NAME} CONFIG OPTIONAL_COMPONENTS ${ZLIB_SEARCH_TYPE})
       endif ()
       set(H5_ZLIB_FOUND ${ZLIB_FOUND})
       if (H5_ZLIB_FOUND)
@@ -179,9 +179,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)
     if (HDF5_USE_LIBAEC_STATIC)
-      set(LIBAEC_SEARCH_TYPE static)
+      set(LIBAEC_SEARCH_TYPE "static")
     else ()
-      set(LIBAEC_SEARCH_TYPE shared)
+      set(LIBAEC_SEARCH_TYPE "shared")
     endif ()
     set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
     set(SZIP_FOUND FALSE)

config/install/hdf5-config.cmake.in

@@ -58,7 +58,7 @@ set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_TOOLS    @HDF5_BUILD_STATIC_TOOLS@)
 #-----------------------------------------------------------------------------
 set (${HDF5_PACKAGE_NAME}_ENABLE_NONSTANDARD_FEATURE_FLOAT16 @HDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16@)
 #-----------------------------------------------------------------------------
-set (${HDF5_PACKAGE_NAME}_ENABLE_ZLIB_SUPPORT  @HDF5_ENABLE_ZLIB_SUPPORT@)
+set (${HDF5_PACKAGE_NAME}_ENABLE_ZLIB_SUPPORT   @HDF5_ENABLE_ZLIB_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT   @HDF5_ENABLE_SZIP_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING  @HDF5_ENABLE_SZIP_ENCODING@)
 #-----------------------------------------------------------------------------
@@ -105,6 +105,19 @@ if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
   )
 endif ()
 
+if (${HDF5_PACKAGE_NAME}_ENABLE_ZLIB_SUPPORT AND NOT @ZLIB_USE_EXTERNAL@)
+  if (@HDF5_MODULE_MODE_ZLIB@)
+    # Expect that the default shared library is expected with FindZLIB.cmake
+    find_package (ZLIB MODULE)
+  else ()
+    find_package (ZLIB NAMES @Z_PACKAGE_NAME@ CONFIG OPTIONAL_COMPONENTS @ZLIB_SEARCH_TYPE@)
+  endif ()
+endif ()
+
+if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND NOT @SZIP_USE_EXTERNAL@)
+  find_package (LIBAEC NAMES @LIBAEC_PACKAGE_NAME@ CONFIG OPTIONAL_COMPONENTS @LIBAEC_SEARCH_TYPE@)
+endif ()
+
 #-----------------------------------------------------------------------------
 # Directories
 #-----------------------------------------------------------------------------
@@ -142,10 +155,10 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR  @HDF5_VERSION_MINOR@)
 # project which has already built hdf5 as a subproject
 #-----------------------------------------------------------------------------
 if (NOT TARGET "@HDF5_PACKAGE@")
-  if (${HDF5_PACKAGE_NAME}_ENABLE_ZLIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
+  if (${HDF5_PACKAGE_NAME}_ENABLE_ZLIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND @ZLIB_USE_EXTERNAL@)
     include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@[email protected])
   endif ()
-  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
+  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND @SZIP_USE_EXTERNAL@)
     include (@PACKAGE_SHARE_INSTALL_DIR@/@LIBAEC_PACKAGE_NAME@@[email protected])
   endif ()
   include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@[email protected])