summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-05-08 13:58:22 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-05-08 13:58:22 (GMT)
commitaef4c9b02b85a20f6df1fce7832bc9cd9041fc1b (patch)
tree5d7fc7176086cbb9a4fa073c6003e795443b835e
parent96cabf6c59a19a806092aff983480d6848f89279 (diff)
downloadhdf5-aef4c9b02b85a20f6df1fce7832bc9cd9041fc1b.zip
hdf5-aef4c9b02b85a20f6df1fce7832bc9cd9041fc1b.tar.gz
hdf5-aef4c9b02b85a20f6df1fce7832bc9cd9041fc1b.tar.bz2
OESS-65 fix packaging config files
-rw-r--r--CMakeFilters.cmake3
-rw-r--r--config/cmake/cacheinit.cmake2
-rw-r--r--config/cmake/mccacheinit.cmake2
-rw-r--r--config/cmake_ext_mod/HDFLibMacros.cmake2
-rw-r--r--release_docs/INSTALL_CMake.txt1
5 files changed, 7 insertions, 3 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 0d64b55..962c68b 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -123,6 +123,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
message (STATUS "Filter SZIP is built")
if (USE_LIBAEC)
message (STATUS "... with library AEC")
+ set (SZ_PACKAGE_NAME LIBAEC_PACKAGE_NAME)
+ else ()
+ set (SZ_PACKAGE_NAME SZIP_PACKAGE_NAME)
endif ()
else ()
message (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 4efb185..4846997 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -47,5 +47,5 @@ set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed f
set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
-
+set (LIBAEC_PACKAGE_NAME "libaec" CACHE STRING "Name of AEC SZIP package" FORCE)
set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index f4bfb07..af07894 100644
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -59,5 +59,5 @@ set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
set (CTEST_CONFIGURATION_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
-
+set (LIBAEC_PACKAGE_NAME "libaec" CACHE STRING "Name of AEC SZIP package" FORCE)
set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index cbca47f..2e658ce 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -126,7 +126,7 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
endif ()
externalproject_get_property (SZIP BINARY_DIR SOURCE_DIR)
-##include (${BINARY_DIR}/${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
+##include (${BINARY_DIR}/${SZ_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
# Create imported target szip-static
if (USE_LIBAEC)
add_library(${HDF_PACKAGE_NAMESPACE}szip-static STATIC IMPORTED)
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index a0386cd..5442f6c 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -479,6 +479,7 @@ These five steps are described in detail below.
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)
+ set (LIBAEC_PACKAGE_NAME "libaec" CACHE STRING "Name of AEC SZIP package" FORCE)
set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
2. Configure the cache settings