@@ -10,6 +10,7 @@
|
||||
# help@hdfgroup.org.
|
||||
#
|
||||
option (USE_LIBAEC "Use AEC library as SZip Filter" OFF)
|
||||
option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
|
||||
|
||||
include (ExternalProject)
|
||||
include (FetchContent)
|
||||
@@ -110,13 +111,24 @@ option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
|
||||
if (HDF5_ENABLE_SZIP_SUPPORT)
|
||||
option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
|
||||
if (NOT SZIP_USE_EXTERNAL)
|
||||
find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
|
||||
if (NOT SZIP_FOUND)
|
||||
find_package (SZIP) # Legacy find
|
||||
set(SZIP_FOUND FALSE)
|
||||
if (USE_LIBAEC)
|
||||
set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
|
||||
find_package (libaec 1.0.5 CONFIG)
|
||||
if (SZIP_FOUND)
|
||||
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (NOT SZIP_FOUND)
|
||||
find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
|
||||
if (NOT SZIP_FOUND)
|
||||
find_package (SZIP) # Legacy find
|
||||
if (SZIP_FOUND)
|
||||
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
if (SZIP_FOUND)
|
||||
set (H5_HAVE_FILTER_SZIP 1)
|
||||
|
||||
@@ -84,7 +84,21 @@ Bug Fixes since HDF5-1.12.1 release
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
-
|
||||
- Better support for libaec (open-source Szip library) in CMake
|
||||
|
||||
Implemented better support for libaec 1.0.5 (or later) library. This version
|
||||
of libaec contains improvements for better integration with HDF5. Furthermore,
|
||||
the variable USE_LIBAEC_STATIC has been introduced to allow to make use of
|
||||
static version of libaec library. Use libaec_DIR or libaec_ROOT to set
|
||||
the location in which libaec can be found.
|
||||
|
||||
Be aware, the Szip library of libaec 1.0.4 depends on another library within
|
||||
libaec library. This dependency is not specified in the current CMake
|
||||
configuration which means that one can not use the static Szip library of
|
||||
libaec 1.0.4 when building HDF5. This has been resolved in libaec 1.0.5.
|
||||
|
||||
(JWSB - 2021/06/22)
|
||||
|
||||
|
||||
|
||||
Fortran API
|
||||
|
||||
Reference in New Issue
Block a user