From 6b9ee19248e7e093fe75f70faec37fc77bf7af04 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Thu, 30 Sep 2021 10:47:44 -0500
Subject: Merge Upgrade libaec to 1.0.6 #1037 (#1038)

---
 config/cmake_ext_mod/HDFLibMacros.cmake | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index 821ac2d..1ac4134 100644
--- 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
-- 
cgit v0.12