mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-06 15:34:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2509 from WardF/plugin-ncconfig.wif

Browse Source 
Add new options to nc-config
This commit is contained in:
Ward Fisher 2022-09-20 09:27:28 -06:00 committed by GitHub
commit 6665dab949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 180 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1185,7 +1185,7 @@ IF(ENABLE_PLUGIN_INSTALL)
IF(ISMSVC OR ISMINGW) IF(ISMSVC OR ISMINGW)
SET(PLUGIN_INSTALL_DIR "$ENV{ALLUSERSPROFILE}\\hdf5\\lib\\plugin") SET(PLUGIN_INSTALL_DIR "$ENV{ALLUSERSPROFILE}\\hdf5\\lib\\plugin")
ELSE() ELSE()
SET(PLUGIN_PLUGIN_DIR "/usr/local/hdf5/lib/plugin") SET(PLUGIN_INSTALL_DIR "/usr/local/hdf5/lib/plugin")
ENDIF() ENDIF()
ENDIF() ENDIF()
MESSAGE("Defaulting to -DPLUGIN_INSTALL_DIR=${PLUGIN_INSTALL_DIR}") MESSAGE("Defaulting to -DPLUGIN_INSTALL_DIR=${PLUGIN_INSTALL_DIR}")

1
RELEASE_NOTES.md
View File

@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
## 4.9.1 - T.B.D. ## 4.9.1 - T.B.D.
* [Enhancement] Add new options to `nc-config`: `--has-multifilters`, `--has-stdfilters`, `--has-quantize`, `--plugindir`. See [Github #2509](https://github.com/Unidata/netcdf-c/pull/2509) for more information.
* [Bug Fix] Fix some errors detected in PR 2497. [PR #2497](https://github.com/Unidata/netcdf-c/pull/2497) . See [Github #2503](https://github.com/Unidata/netcdf-c/pull/2503). * [Bug Fix] Fix some errors detected in PR 2497. [PR #2497](https://github.com/Unidata/netcdf-c/pull/2497) . See [Github #2503](https://github.com/Unidata/netcdf-c/pull/2503).
* [Bug Fix] Split the remote tests into two parts: one for the remotetest server and one for all other external servers. Also add a configure option to enable the latter set. See [Github #2491](https://github.com/Unidata/netcdf-c/pull/2491). * [Bug Fix] Split the remote tests into two parts: one for the remotetest server and one for all other external servers. Also add a configure option to enable the latter set. See [Github #2491](https://github.com/Unidata/netcdf-c/pull/2491).
* [Bug Fix] Fix blosc plugin errors. See [Github #2461](https://github.com/Unidata/netcdf-c/pull/2461). * [Bug Fix] Fix blosc plugin errors. See [Github #2461](https://github.com/Unidata/netcdf-c/pull/2461).

138
nc-config.cmake.in
View File

@ -8,6 +8,7 @@ prefix="@CMAKE_INSTALL_PREFIX@"
exec_prefix="@CMAKE_INSTALL_PREFIX@" exec_prefix="@CMAKE_INSTALL_PREFIX@"
libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
plugindir="@PLUGIN_INSTALL_DIR@"
cc="@CMAKE_C_COMPILER@" cc="@CMAKE_C_COMPILER@"
cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
@ -108,6 +109,34 @@ else
has_nczarr="yes" has_nczarr="yes"
fi fi
has_benchmarks="@HAS_BENCHMARKS@"
if [ -z "$has_benchmarks" -o "$has_benchmarks" = "OFF" -o "$has_benchmarks" = "FALSE" ]; then
has_benchmarks="no"
else
has_benchmarks="yes"
fi
has_multifilters="@HAS_MULTIFILTERS@"
if [ -z "$has_multifilters" -o "$has_multifilters" = "OFF" -o "$has_multifilters" = "FALSE" ]; then
has_multifilters="no"
else
has_multifilters="yes"
fi
has_zstd="@HAS_ZSTD"
if [ -z "$has_zstd" -o "$has_zstd" = "OFF" -o "$has_zstd" = "FALSE" ]; then
has_zstd="no"
else
has_zstd="yes"
fi
has_quantize="@HAS_QUANTIZE@"
if [ -z "$has_quantize" -o "$has_quantize" = "OFF" -o "$has_quantize" = "FALSE" ]; then
has_quantize="no"
else
has_quantize="yes"
fi
version="@PACKAGE@ @VERSION@" version="@PACKAGE@ @VERSION@"
@ -151,32 +180,39 @@ Usage: nc-config [OPTION]
Available values for OPTION include: Available values for OPTION include:
--help display this help message and exit --help display this help message and exit
--all display all options --all display all options
--cc C compiler --cc C compiler
--cflags pre-processor and compiler flags --cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed --has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed --has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed --has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build --has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build --has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated) --has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled --has-nc2 whether NetCDF-2 API is enabled
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build --has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4) --has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
--has-hdf4 whether HDF4 was used in build --has-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging. --has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build --has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build --has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build --has-cdf5 whether cdf5 support is included in build
--has-parallel4 whether has parallel IO support via HDF5 --has-parallel4 whether has parallel IO support via HDF5
--has-parallel whether has parallel IO support via HDF5 or PnetCDF --has-parallel whether has parallel IO support via HDF5 or PnetCDF
--has-nczarr whether nczarr enabled --has-nczarr whether nczarr enabled
--has-zstd whether zstandard compression enabled
--has-multifilters whether multifilter support is enabled
--has-quanitze whether quantize support is enabled
--has-stdfilters lists the standard filters enabled
--has-benchmarks whether benchmarks enabled
--libs library linking information for netcdf --libs library linking information for netcdf
--static library linking information for statically-compiled netcdf --static library linking information for statically-compiled netcdf
--prefix Install prefix --prefix Install prefix
--includedir Include directory --includedir Include directory
--libdir Library directory --libdir Library directory
--plugindir Plugin directory
--version Library version --version Library version
EOF EOF
@ -230,7 +266,6 @@ if [ -f "$ncxx4conf" ]; then
echo " --cxx4libs -> $cxx4libs" echo " --cxx4libs -> $cxx4libs"
fi fi
echo echo
echo " --has-fortran -> $has_fortran" echo " --has-fortran -> $has_fortran"
if [ -f "$nfconf" ]; then if [ -f "$nfconf" ]; then
echo " --fc -> $fc" echo " --fc -> $fc"
@ -240,24 +275,31 @@ if [ -f "$nfconf" ]; then
echo " --has-f03 -> $has_f03" echo " --has-f03 -> $has_f03"
echo echo
fi fi
echo " --has-dap -> $has_dap2" echo
echo " --has-dap2 -> $has_dap2" echo " --has-dap -> $has_dap2"
echo " --has-dap4 -> $has_dap4" echo " --has-dap2 -> $has_dap2"
echo " --has-nc2 -> $has_nc2" echo " --has-dap4 -> $has_dap4"
echo " --has-nc4 -> $has_nc4" echo " --has-nc2 -> $has_nc2"
echo " --has-hdf5 -> $has_hdf5" echo " --has-nc4 -> $has_nc4"
echo " --has-hdf4 -> $has_hdf4" echo " --has-hdf5 -> $has_hdf5"
echo " --has-logging -> $has_logging" echo " --has-hdf4 -> $has_hdf4"
echo " --has-pnetcdf -> $has_pnetcdf" echo " --has-logging -> $has_logging"
echo " --has-szlib -> $has_szlib" echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-cdf5 -> $has_cdf5" echo " --has-szlib -> $has_szlib"
echo " --has-parallel4 -> $has_parallel4" echo " --has-cdf5 -> $has_cdf5"
echo " --has-parallel -> $has_parallel" echo " --has-parallel4 -> $has_parallel4"
echo " --has-nczarr -> $has_nczarr" echo " --has-parallel -> $has_parallel"
echo " --has-nczarr -> $has_nczarr"
echo " --has-zstd -> $has_zstd"
echo " --has-benchmarks -> $has_benchmarks"
echo " --has-multifilters -> $has_multifilters"
echo " --has-stdfilters -> @STD_FILTERS@"
echo " --has-quantize -> $has_quantize"
echo echo
echo " --prefix -> $prefix" echo " --prefix -> $prefix"
echo " --includedir -> $includedir" echo " --includedir -> $includedir"
echo " --libdir -> $libdir" echo " --libdir -> $libdir"
echo " --plugindir -> $plugindir"
echo " --version -> $version" echo " --version -> $version"
echo echo
} }
@ -303,6 +345,10 @@ while test $# -gt 0; do
echo $cflags echo $cflags
;; ;;
--plugindir)
echo $plugindir
;;
--has-dap) --has-dap)
echo $has_dap2 echo $has_dap2
;; ;;
@ -359,6 +405,26 @@ while test $# -gt 0; do
echo $has_nczarr echo $has_nczarr
;; ;;
--has-zstd)
echo $has_zstd
;;
--has-benchmarks)
echo $has_benchmarks
;;
--has-multifilters)
echo $has_multifilters
;;
--has-stdfilters)
echo @STD_FILTERS@
;;
--has-quantize)
echo $has_quantize
;;
--libs) --libs)
if [ "x$HAS_STATIC" = "xTRUE" ]; then if [ "x$HAS_STATIC" = "xTRUE" ]; then
echo $libs $libsprivate echo $libs $libsprivate

119
nc-config.in
View File

@ -8,6 +8,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
plugindir=@PLUGIN_INSTALL_DIR@
if test "x@PLUGIN_INSTALL_DIR@" == "xno" ; then
plugindir=""
fi
cc="@CC@" cc="@CC@"
cflags="-I${includedir} @CPPFLAGS@" cflags="-I${includedir} @CPPFLAGS@"
@ -30,6 +35,9 @@ has_parallel4="@HAS_PARALLEL4@"
has_nczarr="@HAS_NCZARR@" has_nczarr="@HAS_NCZARR@"
has_zstd="@HAS_ZSTD@" has_zstd="@HAS_ZSTD@"
has_benchmarks="@HAS_BENCHMARKS@" has_benchmarks="@HAS_BENCHMARKS@"
has_multifilters="@HAS_MULTIFILTERS@"
has_quantize="@HAS_QUANTIZE@"
has_stdfilters="@STD_FILTERS@"
version="@PACKAGE_NAME@ @PACKAGE_VERSION@" version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
HAS_STATIC="" HAS_STATIC=""
@ -74,34 +82,39 @@ Usage: nc-config [OPTION]
Available values for OPTION include: Available values for OPTION include:
--help display this help message and exit --help display this help message and exit
--all display all options --all display all options
--cc C compiler --cc C compiler
--cflags pre-processor and compiler flags --cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed --has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed --has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed --has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build --has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build --has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated) --has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled --has-nc2 whether NetCDF-2 API is enabled
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build --has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4) --has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
--has-hdf4 whether HDF4 was used in build --has-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging. --has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build --has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build --has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build --has-cdf5 whether cdf5 support is included in build
--has-parallel4 whether has parallel IO support via HDF5 --has-parallel4 whether has parallel IO support via HDF5
--has-parallel whether has parallel IO support via HDF5 or PnetCDF --has-parallel whether has parallel IO support via HDF5 or PnetCDF
--has-nczarr whether nczarr enabled --has-nczarr whether nczarr enabled
--has-zstd whether zstandard compression enabled --has-zstd whether zstandard compression enabled
--has-benchmarks whether benchmarks enabled --has-multifilters whether multifilter support is enabled
--has-quanitze whether quantize support is enabled
--has-stdfilters lists the standard filters enabled
--has-benchmarks whether benchmarks enabled
--libs library linking information for netcdf --libs library linking information for netcdf
--static library linking information for statically-compiled netcdf --static library linking information for statically-compiled netcdf
--prefix Install prefix --prefix Install prefix
--includedir Include directory --includedir Include directory
--libdir Library directory --libdir Library directory
--plugindir Plugin directory
--version Library version --version Library version
EOF EOF
@ -165,27 +178,31 @@ if [ -f "$nfconf" ]; then
echo " --has-f03 -> $has_f03" echo " --has-f03 -> $has_f03"
echo echo
fi fi
echo " --has-dap -> $has_dap" echo " --has-dap -> $has_dap"
echo " --has-dap2 -> $has_dap" echo " --has-dap2 -> $has_dap"
echo " --has-dap4 -> $has_dap4" echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2" echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4" echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5" echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4" echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging" echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf" echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib" echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5" echo " --has-cdf5 -> $has_cdf5"
echo " --has-parallel4 -> $has_parallel4" echo " --has-parallel4 -> $has_parallel4"
echo " --has-parallel -> $has_parallel" echo " --has-parallel -> $has_parallel"
echo " --has-nczarr -> $has_nczarr" echo " --has-nczarr -> $has_nczarr"
echo " --has-zstd -> $has_zstd" echo " --has-zstd -> $has_zstd"
echo " --has-benchmarks -> $has_benchmarks" echo " --has-benchmarks -> $has_benchmarks"
echo " --has-multifilters -> $has_multifilters"
echo " --has-stdfilters -> @STD_FILTERS@"
echo " --has-quantize -> $has_quantize"
echo echo
echo " --prefix -> $prefix" echo " --prefix -> $prefix"
echo " --includedir -> $includedir" echo " --includedir -> $includedir"
echo " --libdir -> $libdir" echo " --libdir -> $libdir"
echo " --version -> $version" echo " --plugindir -> $plugindir"
echo " --version -> $version"
echo echo
} }
@ -231,6 +248,10 @@ while test $# -gt 0; do
echo $cflags echo $cflags
;; ;;
--plugindir)
echo $plugindir
;;
--has-dap) --has-dap)
echo $has_dap echo $has_dap
;; ;;
@ -295,6 +316,18 @@ while test $# -gt 0; do
echo $has_benchmarks echo $has_benchmarks
;; ;;
--has-multifilters)
echo $has_multifilters
;;
--has-stdfilters)
echo @STD_FILTERS@
;;
--has_quantize)
echo $has_quantize
;;
--libs) --libs)
if [ "x$HAS_STATIC" = "xTRUE" ]; then if [ "x$HAS_STATIC" = "xTRUE" ]; then
echo $libs $libsprivate echo $libs $libsprivate