Correct CMake option defaults - deprecate szip for libaec (#2778)

1 files changed, 8 insertions, 26 deletions

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index eb62071..a55d7ae 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -9,7 +9,6 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-option (USE_LIBAEC "Use AEC library as SZip Filter" OFF)
 option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
 option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 0)
 option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 0)
@@ -29,8 +28,6 @@ endif ()
 
 option (BUILD_SZIP_WITH_FETCHCONTENT "Use FetchContent to use original source files" OFF)
 if (BUILD_SZIP_WITH_FETCHCONTENT)
-  # Only libaec library is usable
-  set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
   set (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1)
   if (NOT LIBAEC_USE_LOCALCONTENT)
     set (SZIP_URL ${LIBAEC_TGZ_ORIGPATH}/${LIBAEC_TGZ_ORIGNAME})
@@ -66,10 +63,7 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
       message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
     endif ()
     if (NOT BUILD_SZIP_WITH_FETCHCONTENT)
-      set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
-      if (USE_LIBAEC)
-        set (SZIP_URL ${TGZPATH}/${SZAEC_TGZ_NAME})
-      endif ()
+      set (SZIP_URL ${TGZPATH}/${SZAEC_TGZ_NAME})
     endif ()
     if (NOT EXISTS "${SZIP_URL}")
       set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
@@ -142,15 +136,13 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
   if (NOT SZIP_USE_EXTERNAL)
     set(SZIP_FOUND FALSE)
-    if (USE_LIBAEC)
-      set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
-      find_package (libaec 1.0.5 CONFIG)
-      if (SZIP_FOUND)
-        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
-      endif ()
+    set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
+    find_package (libaec 1.0.5 CONFIG)
+    if (SZIP_FOUND)
+      set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
     endif ()
     if (NOT SZIP_FOUND)
-      find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+      find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
       if (NOT SZIP_FOUND)
         find_package (SZIP) # Legacy find
       endif ()
@@ -171,12 +163,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
       set (H5_HAVE_SZLIB_H 1)
       set (H5_HAVE_LIBSZ 1)
       message (VERBOSE "SZIP is built from fetch content")
-      if (USE_LIBAEC)
-        message (VERBOSE "... with library AEC")
-        set (SZIP_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
-      else ()
-        set (SZIP_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
-      endif ()
+      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})
@@ -184,12 +171,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
       set (H5_HAVE_SZLIB_H 1)
       set (H5_HAVE_LIBSZ 1)
       message (VERBOSE "Filter SZIP is built")
-      if (USE_LIBAEC)
-        message (VERBOSE "... with library AEC")
-        set (SZIP_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
-      else ()
-        set (SZIP_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
-      endif ()
+      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")