Merge Upgrade libaec to 1.0.6 #1037 (#1038)

HDFGroup · Sep 30, 2021 · 6b9ee19 · 6b9ee19
1 parent 4da60c9
commit 6b9ee19
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -145,7 +145,11 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
   set (SZIP_LIBRARIES ${SZIP_STATIC_LIBRARY})
 
   set (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
+  if (USE_LIBAEC)
+    set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/include")
+  else ()
+    set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
+  endif ()
   set (SZIP_FOUND 1)
   set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR_GEN} ${SZIP_INCLUDE_DIR})
 endmacro ()
@@ -154,6 +158,8 @@ endmacro ()
 macro (PACKAGE_SZIP_LIBRARY compress_type)
   set (SZIP_HDR "SZconfig")
   if (USE_LIBAEC)
+    set (SZIP_HDR "aec_config")
+  else ()
     set (SZIP_HDR "libaec_Export")
   endif ()
   add_custom_target (SZIP-GenHeader-Copy ALL