summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-09-29 13:22:45 (GMT)
committerGitHub <noreply@github.com>2021-09-29 13:22:45 (GMT)
commit9914adb1c32aef4ccc35a6cbdb3b19c7754136c7 (patch)
tree04da298d4a58d158698aac4bc12bd8b3b03fae84 /config
parent397cf5144d72e416aa9d4b3dc1a95961383c9595 (diff)
downloadhdf5-9914adb1c32aef4ccc35a6cbdb3b19c7754136c7.zip
hdf5-9914adb1c32aef4ccc35a6cbdb3b19c7754136c7.tar.gz
hdf5-9914adb1c32aef4ccc35a6cbdb3b19c7754136c7.tar.bz2
Merge Upgrade libaec to 1.0.6 #1037 (#1039)
Diffstat (limited to 'config')
-rw-r--r--config/cmake_ext_mod/HDFLibMacros.cmake8
1 files changed, 7 insertions, 1 deletions
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