Update actions and change defaults of compression (fix vars) (#3042)

* Update actions and change defaults of compression (fix vars)

* Unique location for branches

1 files changed, 43 insertions, 47 deletions

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index a55d7ae..6573ee3 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -58,16 +58,20 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
     if (NOT BUILD_ZLIB_WITH_FETCHCONTENT)
       set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
     endif ()
-    if (NOT EXISTS "${ZLIB_URL}")
-      set (HDF5_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "" FORCE)
-      message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
+    if (ZLIB_USE_LOCALCONTENT)
+      if (NOT EXISTS "${ZLIB_URL}")
+        set (HDF5_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "" FORCE)
+        message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
+      endif ()
     endif ()
     if (NOT BUILD_SZIP_WITH_FETCHCONTENT)
       set (SZIP_URL ${TGZPATH}/${SZAEC_TGZ_NAME})
     endif ()
-    if (NOT EXISTS "${SZIP_URL}")
-      set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
-      message (VERBOSE "Filter SZIP file ${SZIP_URL} not found")
+    if (LIBAEC_USE_LOCALCONTENT)
+      if (NOT EXISTS "${SZIP_URL}")
+        set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
+        message (VERBOSE "Filter SZIP file ${SZIP_URL} not found")
+      endif ()
     endif ()
   else ()
     set (ZLIB_USE_EXTERNAL 0)
@@ -78,7 +82,7 @@ endif ()
 #-----------------------------------------------------------------------------
 # Option for ZLib support
 #-----------------------------------------------------------------------------
-option (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF)
+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)
@@ -87,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})
@@ -99,20 +100,12 @@ 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})
-      else ()
-        message (FATAL_ERROR " ZLib is Required for ZLib support in HDF5")
       endif ()
     endif ()
   else ()
@@ -121,11 +114,18 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
     set (H5_HAVE_ZLIB_H 1)
     set (H5_HAVE_LIBZ 1)
   endif ()
-  if (H5_HAVE_FILTER_DEFLATE)
-    set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DEFLATE")
+  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 ()
+    INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
+    message (VERBOSE "Filter HDF5_ZLIB is ON")
+  else ()
+    message (WARNING " ZLib support in HDF5 was enabled but not found")
   endif ()
-  INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
-  message (VERBOSE "Filter HDF5_ZLIB is ON")
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -133,7 +133,7 @@ endif ()
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
-  option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
+  option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)
     set(SZIP_FOUND FALSE)
     set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
@@ -146,44 +146,40 @@ 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})
-    else ()
-      message (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
     endif ()
   endif ()
-  INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
-  message (VERBOSE "Filter SZIP is ON")
-  if (H5_HAVE_FILTER_SZIP)
-    set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DECODE")
-  endif ()
-  if (HDF5_ENABLE_SZIP_ENCODING)
-    set (H5_HAVE_SZIP_ENCODER 1)
-    set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} ENCODE")
+  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)
+      set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DECODE")
+    endif ()
+    if (HDF5_ENABLE_SZIP_ENCODING)
+      set (H5_HAVE_SZIP_ENCODER 1)
+      set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} ENCODE")
+    endif ()
+  else ()
+    message (WARNING "SZIP support in HDF5 was enabled but not found")
   endif ()
 endif ()