mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-21 08:39:46 +08:00
Merge pull request #2509 from WardF/plugin-ncconfig.wif
Add new options to nc-config
This commit is contained in:
Ward Fisher
GitHub
commit
6665dab949
@ -1185,7 +1185,7 @@ IF(ENABLE_PLUGIN_INSTALL)
|
||||
IF(ISMSVC OR ISMINGW)
|
||||
SET(PLUGIN_INSTALL_DIR "$ENV{ALLUSERSPROFILE}\\hdf5\\lib\\plugin")
|
||||
ELSE()
|
||||
SET(PLUGIN_PLUGIN_DIR "/usr/local/hdf5/lib/plugin")
|
||||
SET(PLUGIN_INSTALL_DIR "/usr/local/hdf5/lib/plugin")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
MESSAGE("Defaulting to -DPLUGIN_INSTALL_DIR=${PLUGIN_INSTALL_DIR}")
|
||||
|
||||
@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
|
||||
|
||||
## 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] 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).
|
||||
|
||||
@ -8,6 +8,7 @@ prefix="@CMAKE_INSTALL_PREFIX@"
|
||||
exec_prefix="@CMAKE_INSTALL_PREFIX@"
|
||||
libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
|
||||
includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
plugindir="@PLUGIN_INSTALL_DIR@"
|
||||
|
||||
cc="@CMAKE_C_COMPILER@"
|
||||
cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
@ -108,6 +109,34 @@ else
|
||||
has_nczarr="yes"
|
||||
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@"
|
||||
|
||||
|
||||
@ -172,11 +201,18 @@ Available values for OPTION include:
|
||||
--has-parallel4 whether has parallel IO support via HDF5
|
||||
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
|
||||
--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
|
||||
--static library linking information for statically-compiled netcdf
|
||||
--prefix Install prefix
|
||||
--includedir Include directory
|
||||
--libdir Library directory
|
||||
--plugindir Plugin directory
|
||||
--version Library version
|
||||
|
||||
EOF
|
||||
@ -230,7 +266,6 @@ if [ -f "$ncxx4conf" ]; then
|
||||
echo " --cxx4libs -> $cxx4libs"
|
||||
fi
|
||||
echo
|
||||
|
||||
echo " --has-fortran -> $has_fortran"
|
||||
if [ -f "$nfconf" ]; then
|
||||
echo " --fc -> $fc"
|
||||
@ -240,6 +275,7 @@ if [ -f "$nfconf" ]; then
|
||||
echo " --has-f03 -> $has_f03"
|
||||
echo
|
||||
fi
|
||||
echo
|
||||
echo " --has-dap -> $has_dap2"
|
||||
echo " --has-dap2 -> $has_dap2"
|
||||
echo " --has-dap4 -> $has_dap4"
|
||||
@ -254,10 +290,16 @@ fi
|
||||
echo " --has-parallel4 -> $has_parallel4"
|
||||
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 " --prefix -> $prefix"
|
||||
echo " --includedir -> $includedir"
|
||||
echo " --libdir -> $libdir"
|
||||
echo " --plugindir -> $plugindir"
|
||||
echo " --version -> $version"
|
||||
echo
|
||||
}
|
||||
@ -303,6 +345,10 @@ while test $# -gt 0; do
|
||||
echo $cflags
|
||||
;;
|
||||
|
||||
--plugindir)
|
||||
echo $plugindir
|
||||
;;
|
||||
|
||||
--has-dap)
|
||||
echo $has_dap2
|
||||
;;
|
||||
@ -359,6 +405,26 @@ while test $# -gt 0; do
|
||||
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)
|
||||
if [ "x$HAS_STATIC" = "xTRUE" ]; then
|
||||
echo $libs $libsprivate
|
||||
|
||||
33
nc-config.in
33
nc-config.in
@ -8,6 +8,11 @@ prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
plugindir=@PLUGIN_INSTALL_DIR@
|
||||
|
||||
if test "x@PLUGIN_INSTALL_DIR@" == "xno" ; then
|
||||
plugindir=""
|
||||
fi
|
||||
|
||||
cc="@CC@"
|
||||
cflags="-I${includedir} @CPPFLAGS@"
|
||||
@ -30,6 +35,9 @@ has_parallel4="@HAS_PARALLEL4@"
|
||||
has_nczarr="@HAS_NCZARR@"
|
||||
has_zstd="@HAS_ZSTD@"
|
||||
has_benchmarks="@HAS_BENCHMARKS@"
|
||||
has_multifilters="@HAS_MULTIFILTERS@"
|
||||
has_quantize="@HAS_QUANTIZE@"
|
||||
has_stdfilters="@STD_FILTERS@"
|
||||
version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
|
||||
HAS_STATIC=""
|
||||
|
||||
@ -96,12 +104,17 @@ Available values for OPTION include:
|
||||
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
|
||||
--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
|
||||
--static library linking information for statically-compiled netcdf
|
||||
--prefix Install prefix
|
||||
--includedir Include directory
|
||||
--libdir Library directory
|
||||
--plugindir Plugin directory
|
||||
--version Library version
|
||||
|
||||
EOF
|
||||
@ -181,10 +194,14 @@ fi
|
||||
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 " --prefix -> $prefix"
|
||||
echo " --includedir -> $includedir"
|
||||
echo " --libdir -> $libdir"
|
||||
echo " --plugindir -> $plugindir"
|
||||
echo " --version -> $version"
|
||||
echo
|
||||
}
|
||||
@ -231,6 +248,10 @@ while test $# -gt 0; do
|
||||
echo $cflags
|
||||
;;
|
||||
|
||||
--plugindir)
|
||||
echo $plugindir
|
||||
;;
|
||||
|
||||
--has-dap)
|
||||
echo $has_dap
|
||||
;;
|
||||
@ -295,6 +316,18 @@ while test $# -gt 0; do
|
||||
echo $has_benchmarks
|
||||
;;
|
||||
|
||||
--has-multifilters)
|
||||
echo $has_multifilters
|
||||
;;
|
||||
|
||||
--has-stdfilters)
|
||||
echo @STD_FILTERS@
|
||||
;;
|
||||
|
||||
--has_quantize)
|
||||
echo $has_quantize
|
||||
;;
|
||||
|
||||
--libs)
|
||||
if [ "x$HAS_STATIC" = "xTRUE" ]; then
|
||||
echo $libs $libsprivate
|
||||
|
||||
Loading…
Reference in New Issue
Block a user