Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add new options to nc-config #2509

Merged
merged 4 commits into from
Sep 20, 2022
Merged

Add new options to nc-config #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e62782
Adding additional flags to nc-config to indicate presence of newer fu…
WardF Sep 19, 2022
3649364
Added plugin directory to nc-config
WardF Sep 19, 2022
92c489f
Add various newer options to nc-config
WardF Sep 19, 2022
2ab4d27
Updated release notes.
WardF Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
138 changes: 102 additions & 36 deletions nc-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
Expand Down Expand Up @@ -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@"


Expand Down Expand Up @@ -151,32 +180,39 @@ Usage: nc-config [OPTION]

Available values for OPTION include:

--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--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-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build
--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
--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--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-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build
--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
Expand Down Expand Up @@ -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"
Expand All @@ -240,24 +275,31 @@ if [ -f "$nfconf" ]; then
echo " --has-f03 -> $has_f03"
echo
fi
echo " --has-dap -> $has_dap2"
echo " --has-dap2 -> $has_dap2"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
echo " --has-parallel4 -> $has_parallel4"
echo " --has-parallel -> $has_parallel"
echo " --has-nczarr -> $has_nczarr"
echo
echo " --has-dap -> $has_dap2"
echo " --has-dap2 -> $has_dap2"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
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
}
Expand Down Expand Up @@ -303,6 +345,10 @@ while test $# -gt 0; do
echo $cflags
;;

--plugindir)
echo $plugindir
;;

--has-dap)
echo $has_dap2
;;
Expand Down Expand Up @@ -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
Expand Down
119 changes: 76 additions & 43 deletions nc-config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
Expand All @@ -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=""

Expand Down Expand Up @@ -74,34 +82,39 @@ Usage: nc-config [OPTION]

Available values for OPTION include:

--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--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-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build
--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-benchmarks whether benchmarks enabled
--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--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-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build
--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
Expand Down Expand Up @@ -165,27 +178,31 @@ if [ -f "$nfconf" ]; then
echo " --has-f03 -> $has_f03"
echo
fi
echo " --has-dap -> $has_dap"
echo " --has-dap2 -> $has_dap"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
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-dap -> $has_dap"
echo " --has-dap2 -> $has_dap"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
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 " --version -> $version"
echo " --prefix -> $prefix"
echo " --includedir -> $includedir"
echo " --libdir -> $libdir"
echo " --plugindir -> $plugindir"
echo " --version -> $version"
echo
}

Expand Down Expand Up @@ -231,6 +248,10 @@ while test $# -gt 0; do
echo $cflags
;;

--plugindir)
echo $plugindir
;;

--has-dap)
echo $has_dap
;;
Expand Down Expand Up @@ -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
Expand Down