diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-28 12:59:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 12:59:07 (GMT) |
| commit | ecb3383c8ded75a9ed0a146716cca4d5e7c03b69 (patch) | |
| tree | c2535922f3d6ff97a2ff3b585470e86af82b4fc8 | |
| parent | cc7c0eb910306b3e823867e8b9bb58204f0e1422 (diff) | |
| download | hdf5-ecb3383c8ded75a9ed0a146716cca4d5e7c03b69.zip hdf5-ecb3383c8ded75a9ed0a146716cca4d5e7c03b69.tar.gz hdf5-ecb3383c8ded75a9ed0a146716cca4d5e7c03b69.tar.bz2 | |
Develop libaec up (#1037)
* Upgrade libaec to 1.0.6
* correct include file name
| -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 a60d09f..2af3229 100644 --- a/config/cmake_ext_mod/HDFLibMacros.cmake +++ b/config/cmake_ext_mod/HDFLibMacros.cmake @@ -158,7 +158,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 () @@ -167,6 +171,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 |