OESS-65 replace szip with aec szip

6 files changed, 44 insertions, 50 deletions

diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 1c95266..47991bf 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -299,7 +299,7 @@ if (HDF5_ENABLE_GROUPZERO_WARNINGS)
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS0})
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS0})
       endif ()
     endif ()
   endif ()
@@ -318,7 +318,7 @@ if (HDF5_ENABLE_GROUPONE_WARNINGS)
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS1})
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS1})
       endif ()
     endif ()
   endif ()
@@ -337,7 +337,7 @@ if (HDF5_ENABLE_GROUPTWO_WARNINGS)
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS2})
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS2})
       endif ()
     endif ()
   endif ()
@@ -356,7 +356,7 @@ if (HDF5_ENABLE_GROUPTHREE_WARNINGS)
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS3})
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS3})
       endif ()
     endif ()
   endif ()
@@ -370,7 +370,7 @@ if (HDF5_ENABLE_GROUPFOUR_WARNINGS)
   if (NOT MSVC)
     if (CMAKE_COMPILER_IS_GNUCC)
       if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS4})
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS4})
       endif ()
     endif ()
   endif ()
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index ddd3703..6dbaa64 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -93,8 +93,8 @@ if (NOT MSVC)
         list (APPEND H5_CFLAGS0 "-Wsign-compare -Wtrigraphs -Wwrite-strings")
       endif()
     elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-      # Add general CFlags except for older versions that are no longer supported
-      if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2)
+      # Add general CFlags for GCC versions 4.2 and above
+      if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2)
         ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
       endif ()
       if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
@@ -138,7 +138,7 @@ if (NOT MSVC)
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     # Technically, variable-length arrays are part of the C99 standard, but
     #   we should approach them a bit cautiously... Only needed for gcc 4.X
-    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2)
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.2-4.last")
     endif ()
 
@@ -153,11 +153,10 @@ if (NOT MSVC)
     endif ()
 
     # Append warning flags that only gcc 4.3+ knows about
-    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.3 AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2)
+    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.3)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.3")
     endif ()
 
-
     # Append more extra warning flags that only gcc 4.4+ know about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.4")
@@ -174,7 +173,7 @@ if (NOT MSVC)
     endif ()
 
     # Append more extra warning flags that only gcc 4.6 and less know about
-    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7 AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2)
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.2-4.6")
     endif ()
 
@@ -218,7 +217,7 @@ if (NOT MSVC)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
     endif ()
 
-    # Append more extra warning flags that only gcc 5.1+ know about
+    # Append more extra warning flags that only gcc 5.x+ know about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
@@ -242,6 +241,7 @@ if (NOT MSVC)
     # Append more extra warning flags that only gcc 8.x+ know about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
       ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+      ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
       if (HDF5_ENABLE_DEV_WARNINGS)
         ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
       else ()
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 5254115..4efb185 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -43,6 +43,8 @@ set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
 
 set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE)
+set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
 
 set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
 
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index 3c5b371..45666cc 100644
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -53,6 +53,8 @@ set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
 
 set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE)
+set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
 
 set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
 
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index 9df2b4b..cbca47f 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -20,7 +20,7 @@ macro (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
         GIT_TAG ${JPEG_BRANCH}
         INSTALL_COMMAND ""
         CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
             -DJPEG_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
             -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -39,7 +39,7 @@ macro (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
         URL_MD5 ""
         INSTALL_COMMAND ""
         CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
             -DJPEG_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
             -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -62,14 +62,6 @@ macro (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
   add_dependencies (${HDF_PACKAGE_NAMESPACE}jpeg-static JPEG)
   set (JPEG_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}jpeg-static")
   set (JPEG_LIBRARIES ${JPEG_STATIC_LIBRARY})
-  if (BUILD_SHARED_LIBS)
-    # Create imported target jpeg-shared
-    add_library(${HDF_PACKAGE_NAMESPACE}jpeg-shared SHARED IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}jpeg-shared "jpeg" SHARED "")
-    add_dependencies (${HDF_PACKAGE_NAMESPACE}jpeg-shared JPEG)
-    set (JPEG_SHARED_LIBRARY "${HDF_PACKAGE_NAMESPACE}jpeg-shared")
-    set (JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_SHARED_LIBRARY})
-  endif ()
 
   set (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
   set (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src")
@@ -97,7 +89,7 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
         GIT_TAG ${SZIP_BRANCH}
         INSTALL_COMMAND ""
         CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
             -DSZIP_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
             -DSZIP_EXTERNALLY_CONFIGURED:BOOL=OFF
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -117,7 +109,7 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
         URL_MD5 ""
         INSTALL_COMMAND ""
         CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
             -DSZIP_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
             -DSZIP_EXTERNALLY_CONFIGURED:BOOL=OFF
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -136,19 +128,21 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
 
 ##include (${BINARY_DIR}/${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target szip-static
-  add_library(${HDF_PACKAGE_NAMESPACE}szip-static STATIC IMPORTED)
-  HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-static "szip" STATIC "")
-  add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-static SZIP)
-  set (SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-static")
-  set (SZIP_LIBRARIES ${SZIP_STATIC_LIBRARY})
-  if (BUILD_SHARED_LIBS)
-    # Create imported target szip-shared
-    add_library(${HDF_PACKAGE_NAMESPACE}szip-shared SHARED IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-shared "szip" SHARED "")
-    add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-shared SZIP)
-    set (SZIP_SHARED_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-shared")
-    set (SZIP_LIBRARIES ${SZIP_LIBRARIES} ${SZIP_SHARED_LIBRARY})
+  if (USE_LIBAEC)
+    add_library(${HDF_PACKAGE_NAMESPACE}szip-static STATIC IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-static "sz" STATIC "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-static SZIP)
+    add_library(${HDF_PACKAGE_NAMESPACE}szaec-static STATIC IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szaec-static "aec" STATIC "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}szaec-static SZIP)
+    set (SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-static;${HDF_PACKAGE_NAMESPACE}szaec-static")
+  else ()
+    add_library(${HDF_PACKAGE_NAMESPACE}szip-static STATIC IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-static "szip" STATIC "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-static SZIP)
+    set (SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-static")
   endif ()
+  set (SZIP_LIBRARIES ${SZIP_STATIC_LIBRARY})
 
   set (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
   set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
@@ -158,11 +152,15 @@ endmacro ()
 
 #-------------------------------------------------------------------------------
 macro (PACKAGE_SZIP_LIBRARY compress_type)
+  set (SZIP_HDR "SZconfig")
+  if (USE_LIBAEC)
+    set (SZIP_HDR "libaec_Export")
+  endif ()
   add_custom_target (SZIP-GenHeader-Copy ALL
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
-      COMMENT "Copying ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_INCLUDE_DIR_GEN}/${SZIP_HDR}.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${SZIP_INCLUDE_DIR_GEN}/${SZIP_HDR}.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
   )
-  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SZconfig.h)
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_HDR}.h)
   if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
     add_dependencies (SZIP-GenHeader-Copy SZIP)
   endif ()
@@ -176,7 +174,7 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
         GIT_TAG ${ZLIB_BRANCH}
         INSTALL_COMMAND ""
         CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
             -DZLIB_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
             -DZLIB_EXTERNALLY_CONFIGURED:BOOL=OFF
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -195,7 +193,7 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
         URL_MD5 ""
         INSTALL_COMMAND ""
         CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
             -DZLIB_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
             -DZLIB_EXTERNALLY_CONFIGURED:BOOL=OFF
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -224,14 +222,6 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
   add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static ZLIB)
   set (ZLIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-static")
   set (ZLIB_LIBRARIES ${ZLIB_STATIC_LIBRARY})
-  if (BUILD_SHARED_LIBS)
-    # Create imported target zlib-shared
-    add_library(${HDF_PACKAGE_NAMESPACE}zlib-shared SHARED IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}zlib-shared ${ZLIB_LIB_NAME} SHARED "")
-    add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-shared ZLIB)
-    set (ZLIB_SHARED_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-shared")
-    set (ZLIB_LIBRARIES ${ZLIB_LIBRARIES} ${ZLIB_SHARED_LIBRARY})
-  endif ()
 
   set (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
   set (ZLIB_INCLUDE_DIR "${SOURCE_DIR}")
diff --git a/config/toolchain/build32.cmake b/config/toolchain/build32.cmake
index deb5899..207d03e 100644
--- a/config/toolchain/build32.cmake
+++ b/config/toolchain/build32.cmake
@@ -72,4 +72,4 @@ else ()
 # for libraries and headers in the target directories
   set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
   set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif ()
\ No newline at end of file
+endif ()