mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +08:00
added ZSTD to netcdf_meta.h and libnetcdf.settings
This commit is contained in:
parent
4ad45457d2
commit
57365d4b47
@ -1125,6 +1125,12 @@ FIND_PACKAGE(Bz2)
|
||||
FIND_PACKAGE(Blosc)
|
||||
FIND_PACKAGE(Zstd)
|
||||
|
||||
IF(Zstd_FOUND)
|
||||
SET(HAVE_ZSTD yes)
|
||||
ELSE()
|
||||
SET(HAVE_ZSTD no)
|
||||
ENDIF()
|
||||
|
||||
# Accumulate standard filters
|
||||
set(STD_FILTERS "deflate") # Always have deflate */
|
||||
set_std_filter(SZIP)
|
||||
@ -2465,6 +2471,7 @@ is_enabled(ENABLE_LOGGING HAS_LOGGING)
|
||||
is_enabled(ENABLE_FILTER_TESTING DO_FILTER_TESTS)
|
||||
is_enabled(HAVE_SZ HAS_SZIP)
|
||||
is_enabled(HAVE_SZ HAS_SZLIB_WRITE)
|
||||
is_enabled(HAVE_ZSTD HAS_ZSTD)
|
||||
|
||||
# Generate file from template.
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"
|
||||
|
@ -1860,6 +1860,7 @@ AC_SUBST(HAS_LOGGING,[$enable_logging])
|
||||
AC_SUBST(DO_FILTER_TESTS,[$enable_filter_testing])
|
||||
AC_SUBST(HAS_SZLIB,[$have_sz])
|
||||
AC_SUBST(HAS_SZLIB_WRITE, [$have_sz])
|
||||
AC_SUBST(HAS_ZSTD,[$have_zstd])
|
||||
|
||||
# Always available
|
||||
std_filters="deflate,bzip2"
|
||||
@ -1943,7 +1944,9 @@ AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes])
|
||||
AX_SET_META([NC_HAS_NCZARR],[$enable_nczarr],[yes])
|
||||
AX_SET_META([NC_HAS_MULTIFILTERS],[$has_multifilters],[yes])
|
||||
AX_SET_META([NC_HAS_LOGGING],[$enable_logging],[yes])
|
||||
AX_SET_META([NC_HAS_QUANTIZE],[yes],[yes])
|
||||
AX_SET_META([NC_HAS_SZIP],[$enable_hdf5_szip],[yes])
|
||||
AX_SET_META([NC_HAS_ZSTD],[$have_zstd],[yes])
|
||||
|
||||
# This is the version of the dispatch table. If the dispatch table is
|
||||
# changed, this should be incremented, so that user-defined format
|
||||
|
@ -64,5 +64,6 @@
|
||||
#define NC_HAS_MULTIFILTERS @NC_HAS_MULTIFILTERS@ /*!< Nczarr support. */
|
||||
#define NC_HAS_LOGGING @NC_HAS_LOGGING@ /*!< Logging support. */
|
||||
#define NC_HAS_QUANTIZE @NC_HAS_QUANTIZE@ /*!< Quantization support. */
|
||||
#define NC_HAS_ZSTD @NC_HAS_ZSTD@ /*!< Zstd support. */
|
||||
|
||||
#endif
|
||||
|
@ -48,3 +48,4 @@ Quantization: @HAS_QUANTIZE@
|
||||
Logging: @HAS_LOGGING@
|
||||
SZIP Write Support: @HAS_SZLIB_WRITE@
|
||||
Standard Filters: @STD_FILTERS@
|
||||
ZSTD Support: @HAS_ZSTD@
|
Loading…
Reference in New Issue
Block a user