mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

OESS-65 fix packaging config files

Browse Source
This commit is contained in:
Allen Byrne 2020-05-08 08:58:22 -05:00
parent 96cabf6c59
commit aef4c9b02b
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeFilters.cmake
View File

@ -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")

2
config/cmake/cacheinit.cmake
View File

@ -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)

2
config/cmake/mccacheinit.cmake
View File

@ -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)

2
config/cmake_ext_mod/HDFLibMacros.cmake
View File

@ -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)

1
release_docs/INSTALL_CMake.txt
View File

@ -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