diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-24 16:45:53 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-24 16:45:53 (GMT) |
| commit | e54f5a14d28cf9eb1226ce7feab2e2600d3984b4 (patch) | |
| tree | f15b08ff942f2d3fd194dbff9c37c41f01c371d3 /config/cmake | |
| parent | 8921d12c56960379c7d84584e42bbaf68b30e142 (diff) | |
| parent | 7f44915b442b4d65ccf2f78dae3c1f7224658bea (diff) | |
| download | hdf5-e54f5a14d28cf9eb1226ce7feab2e2600d3984b4.zip hdf5-e54f5a14d28cf9eb1226ce7feab2e2600d3984b4.tar.gz hdf5-e54f5a14d28cf9eb1226ce7feab2e2600d3984b4.tar.bz2 | |
Merge pull request #2534 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '7f44915b442b4d65ccf2f78dae3c1f7224658bea':
Fix NoFilter build
Remove old szip line
OESS-65 add option to use AEC library in place of SZip
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/cacheinit.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/mccacheinit.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 5254115..4efb185 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -43,6 +43,8 @@ set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ) set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE) set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE) +set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE) +set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE) set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE) diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake index 1608202..f4bfb07 100644 --- a/config/cmake/mccacheinit.cmake +++ b/config/cmake/mccacheinit.cmake @@ -51,6 +51,8 @@ set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ) set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE) set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE) +set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE) +set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE) set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE) |