Skip to content

Commit 12d6dbe

Browse files
WardFWardF
authored
Merge pull request #3049 from WardF/nc-config-plugin-path-fix.wif
Update nc-config in support of changes made in #3034
2 parents fb75ad6 + 64d2f31 commit 12d6dbe

3 files changed

Lines changed: 124 additions & 104 deletions

File tree

‎RELEASE_NOTES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ This file contains a high-level description of this package's evolution. Release
1919

2020
> Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake. These are turned on by default currently but will be turned off eventually. Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro. See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information.
2121
22+
23+
* Add new `nc-config` flag, `--plugin-searchpath` to report a plugin search path which may be different from the plugin install directory. See [Github #3046](https://github.com/Unidata/netcdf-c/pull/3034) for more information.
2224
* Cleanup the blosc testing in nc_test4 and nczarr_test. See [Github #3046](https://github.com/Unidata/netcdf-c/pull/3046) for more information.
2325
* Provide better documentation for the .rc file mechanism and API. See [Github #2956](https://github.com/Unidata/netcdf-c/pull/2956) for more information.
2426
* Convert NCZarr V2 to store all netcdf-4 specific info as attributes. This improves interoperability with other Zarr implementations by no longer using non-standard keys. The price to be paid is that lazy attribute reading cannot be supported. See [Github #2836](https://github.com/Unidata/netcdf-c/pull/2936) for more information.

‎nc-config.cmake.in‎

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ exec_prefix="@CMAKE_INSTALL_PREFIX@"
99
libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
1010
includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
1111
plugindir="@NETCDF_PLUGIN_INSTALL_DIR@"
12+
pluginsearchpath="@NETCDF_PLUGIN_SEARCH_PATH@"
1213

1314
cc="@CMAKE_C_COMPILER@"
1415
cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
@@ -142,40 +143,41 @@ Usage: nc-config [OPTION]
142143
143144
Available values for OPTION include:
144145
145-
--help display this help message and exit
146-
--all display all options
147-
--cc C compiler
148-
--cflags pre-processor and compiler flags
146+
--help display this help message and exit
147+
--all display all options
148+
--cc C compiler
149+
--cflags pre-processor and compiler flags
149150
150-
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
151-
--has-dap4 whether DAP4 is enabled in this build
152-
--has-dap same as --has-dap2 (Deprecated)
153-
--has-nc2 whether NetCDF-2 API is enabled
154-
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
155-
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
156-
--has-hdf4 whether HDF4 was used in build
157-
--has-logging whether logging is enabled with --enable-logging.
158-
--has-pnetcdf whether PnetCDF was used in build
159-
--has-szlib whether szlib is included in build
160-
--has-cdf5 whether cdf5 support is included in build
161-
--has-parallel4 whether has parallel IO support via HDF5
162-
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
163-
--has-nczarr whether nczarr enabled
164-
--has-zstd whether zstandard compression enabled
165-
--has-multifilters whether multifilter support is enabled
166-
--has-quanitze whether quantize support is enabled
167-
--has-stdfilters lists the standard filters enabled
168-
--has-benchmarks whether benchmarks enabled
169-
170-
--libs library linking information for netcdf
171-
--libs-ac-syntax forces autotools-compatible syntax argument for libraries
172-
--static library linking information for statically-compiled netcdf
173-
--prefix Install prefix
174-
--includedir Include directory
175-
--libdir Library directory
176-
--plugindir Plugin directory
177-
--version Library version
178-
--build-system Build System
151+
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
152+
--has-dap4 whether DAP4 is enabled in this build
153+
--has-dap same as --has-dap2 (Deprecated)
154+
--has-nc2 whether NetCDF-2 API is enabled
155+
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
156+
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
157+
--has-hdf4 whether HDF4 was used in build
158+
--has-logging whether logging is enabled with --enable-logging.
159+
--has-pnetcdf whether PnetCDF was used in build
160+
--has-szlib whether szlib is included in build
161+
--has-cdf5 whether cdf5 support is included in build
162+
--has-parallel4 whether has parallel IO support via HDF5
163+
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
164+
--has-nczarr whether nczarr enabled
165+
--has-zstd whether zstandard compression enabled
166+
--has-multifilters whether multifilter support is enabled
167+
--has-quanitze whether quantize support is enabled
168+
--has-stdfilters lists the standard filters enabled
169+
--has-benchmarks whether benchmarks enabled
170+
171+
--libs library linking information for netcdf
172+
--libs-ac-syntax forces autotools-compatible syntax argument for libraries
173+
--static library linking information for statically-compiled netcdf
174+
--prefix Install prefix
175+
--includedir Include directory
176+
--libdir Library directory
177+
--plugindir Plugin install directory
178+
--plugin-searchpath Plugin search directory
179+
--version Library version
180+
--build-system Build System
179181
180182
EOF
181183

@@ -187,10 +189,10 @@ all()
187189
echo
188190
echo "This $version has been built with the following features: "
189191
echo
190-
echo " --cc -> $cc"
191-
echo " --cflags -> $cflags"
192-
echo " --libs -> $libs"
193-
echo " --static -> $libsprivate"
192+
echo " --cc -> $cc"
193+
echo " --cflags -> $cflags"
194+
echo " --libs -> $libs"
195+
echo " --static -> $libsprivate"
194196
echo
195197

196198
echo
@@ -214,12 +216,13 @@ all()
214216
echo " --has-stdfilters -> @STD_FILTERS@"
215217
echo " --has-quantize -> $has_quantize"
216218
echo
217-
echo " --prefix -> $prefix"
218-
echo " --includedir -> $includedir"
219-
echo " --libdir -> $libdir"
220-
echo " --plugindir -> $plugindir"
221-
echo " --version -> $version"
222-
echo " --build-system -> cmake"
219+
echo " --prefix -> $prefix"
220+
echo " --includedir -> $includedir"
221+
echo " --libdir -> $libdir"
222+
echo " --plugindir -> $plugindir"
223+
echo " --plugin-searchpath -> $pluginsearchpath"
224+
echo " --version -> $version"
225+
echo " --build-system -> cmake"
223226
echo
224227
}
225228

@@ -275,6 +278,10 @@ while test $# -gt 0; do
275278
echo $plugindir
276279
;;
277280

281+
--plugin-searchpath)
282+
echo $pluginsearchpath
283+
;;
284+
278285
--has-dap)
279286
echo $has_dap2
280287
;;

‎nc-config.in‎

Lines changed: 72 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@ prefix=@prefix@
88
exec_prefix=@exec_prefix@
99
libdir=@libdir@
1010
includedir=@includedir@
11-
plugindir=@PLUGIN_INSTALL_DIR@
11+
plugindir=@NETCDF_PLUGIN_INSTALL_DIR@
12+
pluginsearchpath=@NETCDF_PLUGIN_SEARCH_PATH@
1213

13-
if test "@PLUGIN_INSTALL_DIR@" = "no" ; then
14+
if test "@NETCDF_PLUGIN_INSTALL_DIR@" = "no" ; then
1415
plugindir=""
1516
fi
1617

18+
if test "@NETCDF_PLUGIN_SEARCH_PATH@" = "no" ; then
19+
pluginsearchpath=""
20+
fi
21+
1722
cc="@CC@"
1823
cflags="-I${includedir} @CPPFLAGS@"
1924
libs="-L${libdir} @NC_LIBS@"
@@ -47,38 +52,39 @@ Usage: nc-config [OPTION]
4752
4853
Available values for OPTION include:
4954
50-
--help display this help message and exit
51-
--all display all options
52-
--cc C compiler
53-
--cflags pre-processor and compiler flags
55+
--help display this help message and exit
56+
--all display all options
57+
--cc C compiler
58+
--cflags pre-processor and compiler flags
5459
55-
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
56-
--has-dap4 whether DAP4 is enabled in this build
57-
--has-dap same as --has-dap2 (Deprecated)
58-
--has-nc2 whether NetCDF-2 API is enabled
59-
--has-hdf5 whether HDF5 is used in build
60-
--has-hdf4 whether HDF4 was used in build
61-
--has-logging whether logging is enabled with --enable-logging.
62-
--has-pnetcdf whether PnetCDF was used in build
63-
--has-szlib whether szlib is included in build
64-
--has-cdf5 whether cdf5 support is included in build
65-
--has-parallel4 whether has parallel IO support via HDF5
66-
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
67-
--has-nczarr whether nczarr enabled
68-
--has-zstd whether zstandard compression enabled
69-
--has-multifilters whether multifilter support is enabled
70-
--has-quanitze whether quantize support is enabled
71-
--has-stdfilters lists the standard filters enabled
72-
--has-benchmarks whether benchmarks enabled
73-
74-
--libs library linking information for netcdf
75-
--static library linking information for statically-compiled netcdf
76-
--prefix Install prefix
77-
--includedir Include directory
78-
--libdir Library directory
79-
--plugindir Plugin directory
80-
--version Library version
81-
--build-system Build System
60+
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
61+
--has-dap4 whether DAP4 is enabled in this build
62+
--has-dap same as --has-dap2 (Deprecated)
63+
--has-nc2 whether NetCDF-2 API is enabled
64+
--has-hdf5 whether HDF5 is used in build
65+
--has-hdf4 whether HDF4 was used in build
66+
--has-logging whether logging is enabled with --enable-logging.
67+
--has-pnetcdf whether PnetCDF was used in build
68+
--has-szlib whether szlib is included in build
69+
--has-cdf5 whether cdf5 support is included in build
70+
--has-parallel4 whether has parallel IO support via HDF5
71+
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
72+
--has-nczarr whether nczarr enabled
73+
--has-zstd whether zstandard compression enabled
74+
--has-multifilters whether multifilter support is enabled
75+
--has-quanitze whether quantize support is enabled
76+
--has-stdfilters lists the standard filters enabled
77+
--has-benchmarks whether benchmarks enabled
78+
79+
--libs library linking information for netcdf
80+
--static library linking information for statically-compiled netcdf
81+
--prefix Install prefix
82+
--includedir Include directory
83+
--libdir Library directory
84+
--plugindir Plugin directory
85+
--plugin-searchpath Plugin search directory
86+
--version Library version
87+
--build-system Build System
8288
8389
EOF
8490

@@ -90,35 +96,36 @@ all()
9096
echo
9197
echo "This $version has been built with the following features: "
9298
echo
93-
echo " --cc -> $cc"
94-
echo " --cflags -> $cflags"
95-
echo " --libs -> $libs"
96-
echo " --static -> $libsprivate"
97-
echo " --has-dap -> $has_dap"
98-
echo " --has-dap2 -> $has_dap"
99-
echo " --has-dap4 -> $has_dap4"
100-
echo " --has-nc2 -> $has_nc2"
101-
echo " --has-hdf5 -> $has_hdf5"
102-
echo " --has-hdf4 -> $has_hdf4"
103-
echo " --has-logging -> $has_logging"
104-
echo " --has-pnetcdf -> $has_pnetcdf"
105-
echo " --has-szlib -> $has_szlib"
106-
echo " --has-cdf5 -> $has_cdf5"
107-
echo " --has-parallel4 -> $has_parallel4"
108-
echo " --has-parallel -> $has_parallel"
109-
echo " --has-nczarr -> $has_nczarr"
110-
echo " --has-zstd -> $has_zstd"
111-
echo " --has-benchmarks -> $has_benchmarks"
112-
echo " --has-multifilters -> $has_multifilters"
113-
echo " --has-stdfilters -> @STD_FILTERS@"
114-
echo " --has-quantize -> $has_quantize"
99+
echo " --cc -> $cc"
100+
echo " --cflags -> $cflags"
101+
echo " --libs -> $libs"
102+
echo " --static -> $libsprivate"
103+
echo " --has-dap -> $has_dap"
104+
echo " --has-dap2 -> $has_dap"
105+
echo " --has-dap4 -> $has_dap4"
106+
echo " --has-nc2 -> $has_nc2"
107+
echo " --has-hdf5 -> $has_hdf5"
108+
echo " --has-hdf4 -> $has_hdf4"
109+
echo " --has-logging -> $has_logging"
110+
echo " --has-pnetcdf -> $has_pnetcdf"
111+
echo " --has-szlib -> $has_szlib"
112+
echo " --has-cdf5 -> $has_cdf5"
113+
echo " --has-parallel4 -> $has_parallel4"
114+
echo " --has-parallel -> $has_parallel"
115+
echo " --has-nczarr -> $has_nczarr"
116+
echo " --has-zstd -> $has_zstd"
117+
echo " --has-benchmarks -> $has_benchmarks"
118+
echo " --has-multifilters -> $has_multifilters"
119+
echo " --has-stdfilters -> @STD_FILTERS@"
120+
echo " --has-quantize -> $has_quantize"
115121
echo
116-
echo " --prefix -> $prefix"
117-
echo " --includedir -> $includedir"
118-
echo " --libdir -> $libdir"
119-
echo " --plugindir -> $plugindir"
120-
echo " --version -> $version"
121-
echo " --build-system -> autotools"
122+
echo " --prefix -> $prefix"
123+
echo " --includedir -> $includedir"
124+
echo " --libdir -> $libdir"
125+
echo " --plugindir -> $plugindir"
126+
echo " --plugin-searchpath -> $pluginsearchpath"
127+
echo " --version -> $version"
128+
echo " --build-system -> autotools"
122129
echo
123130
}
124131

@@ -173,6 +180,10 @@ while test $# -gt 0; do
173180
echo $plugindir
174181
;;
175182

183+
--plugin-searchpath)
184+
echo $pluginsearchpath
185+
;;
186+
176187
--has-dap)
177188
echo $has_dap
178189
;;

0 commit comments

Comments
 (0)
⚡