diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-10-01 18:51:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 18:51:24 (GMT) |
| commit | 0c58762e7df2d5b36c4bb969b501c8097fb2901e (patch) | |
| tree | ea3138a767f1b93240c5ca4293cedd0cdb1f7665 | |
| parent | 6f930f92e3ee7783f5df4c7088a6ffc5d401759c (diff) | |
| download | hdf5-0c58762e7df2d5b36c4bb969b501c8097fb2901e.zip hdf5-0c58762e7df2d5b36c4bb969b501c8097fb2901e.tar.gz hdf5-0c58762e7df2d5b36c4bb969b501c8097fb2901e.tar.bz2 | |
Merge Upgrade libaec to 1.0.6 #1037 (#1040)
| -rw-r--r-- | config/cmake_ext_mod/HDFLibMacros.cmake | 8 |
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 |