From 71684199d5aafa9faaa38d9159c500be715c3f54 Mon Sep 17 00:00:00 2001
From: Jan-Willem Blokland <Jan-Willem.Blokland@Shell.com>
Date: Mon, 5 Jun 2023 18:20:50 +0200
Subject: CMake: (fix) Szip / libaec filter (#3035)

* CMake: (fix) Szip / libaec filter

- Fixed the cmake configuration for the filter Szip / libaec.
  Now, the decoding of this filter is properly configured and
  included in the HDF5 library.

* CMake: (fix) Zlib filter

- Improved the cmake configuration for the filter zlib.
---
 CMakeFilters.cmake | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 82dc6fa..6573ee3 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -91,9 +91,6 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
         find_package (ZLIB) # Legacy find
       endif ()
       if (ZLIB_FOUND)
-        set (H5_HAVE_FILTER_DEFLATE 1)
-        set (H5_HAVE_ZLIB_H 1)
-        set (H5_HAVE_LIBZ 1)
         set (H5_ZLIB_HEADER "zlib.h")
         set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
         set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
@@ -103,16 +100,10 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
       if (BUILD_ZLIB_WITH_FETCHCONTENT)
         # Only tgz files available
         ORIGINAL_ZLIB_LIBRARY ("TGZ")
-        set (H5_HAVE_FILTER_DEFLATE 1)
-        set (H5_HAVE_ZLIB_H 1)
-        set (H5_HAVE_LIBZ 1)
         message (VERBOSE "HDF5_ZLIB is built from fetch content")
         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
       elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
-        set (H5_HAVE_FILTER_DEFLATE 1)
-        set (H5_HAVE_ZLIB_H 1)
-        set (H5_HAVE_LIBZ 1)
         message (VERBOSE "Filter HDF5_ZLIB is built")
         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
       endif ()
@@ -124,6 +115,9 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
     set (H5_HAVE_LIBZ 1)
   endif ()
   if (ZLIB_FOUND)
+    set (H5_HAVE_FILTER_DEFLATE 1)
+    set (H5_HAVE_ZLIB_H 1)
+    set (H5_HAVE_LIBZ 1)
     if (H5_HAVE_FILTER_DEFLATE)
       set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DEFLATE")
     endif ()
@@ -152,36 +146,30 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
       if (NOT SZIP_FOUND)
         find_package (SZIP) # Legacy find
       endif ()
-      if (SZIP_FOUND)
-        set (H5_HAVE_FILTER_SZIP 1)
-        set (H5_HAVE_SZLIB_H 1)
-        set (H5_HAVE_LIBSZ 1)
-        set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
-        set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR})
-        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
-      endif ()
+    endif ()
+    if (SZIP_FOUND)
+      set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
+      set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR})
+      set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
     endif ()
   else ()
     if (BUILD_SZIP_WITH_FETCHCONTENT)
       # Only tgz files available
       ORIGINAL_SZIP_LIBRARY ("TGZ" ${HDF5_ENABLE_SZIP_ENCODING})
-      set (H5_HAVE_FILTER_SZIP 1)
-      set (H5_HAVE_SZLIB_H 1)
-      set (H5_HAVE_LIBSZ 1)
       message (VERBOSE "SZIP is built from fetch content")
       message (VERBOSE "... with library AEC")
       set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
     elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
-      set (H5_HAVE_FILTER_SZIP 1)
-      set (H5_HAVE_SZLIB_H 1)
-      set (H5_HAVE_LIBSZ 1)
       message (VERBOSE "Filter SZIP is built")
       message (VERBOSE "... with library AEC")
       set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
     endif ()
   endif ()
   if (SZIP_FOUND)
+    set (H5_HAVE_FILTER_SZIP 1)
+    set (H5_HAVE_SZLIB_H 1)
+    set (H5_HAVE_LIBSZ 1)
     INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
     message (VERBOSE "Filter SZIP is ON")
     if (H5_HAVE_FILTER_SZIP)
-- 
cgit v0.12