diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-03-14 12:03:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 12:03:51 (GMT) |
| commit | dc858321b60d7a7b4f3ea31b2e96933624c6cd2a (patch) | |
| tree | a1c0cd7574406deec95d0782e739c490cfba3112 | |
| parent | 4884a52fc380054ffb297752919cfc4bf3a12d09 (diff) | |
| download | hdf5-dc858321b60d7a7b4f3ea31b2e96933624c6cd2a.zip hdf5-dc858321b60d7a7b4f3ea31b2e96933624c6cd2a.tar.gz hdf5-dc858321b60d7a7b4f3ea31b2e96933624c6cd2a.tar.bz2 | |
1.8 Add -showconfig to h5cc scripts to dump libhdf5.settings file (#1484)
* Merge Add -showconfig to h5cc scripts to dump libhdf5.settings file
* Fix comments
| -rw-r--r-- | config/cmake/libh5cc.in | 23 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 7 |
2 files changed, 29 insertions, 1 deletions
diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in index ecdd13e..6d54088 100644 --- a/config/cmake/libh5cc.in +++ b/config/cmake/libh5cc.in @@ -27,6 +27,27 @@ prg=$dir/$(basename -- "$prg") || exit printf '%s\n' "$prg" printf 'dir is %s\n' "$dir" + +# Show the configuration summary of the library recorded in the +# libhdf5.settings file residing in the lib directory. +showconfigure() +{ + cat $dir/lib/libhdf5.settings + status=$? +} + export PKG_CONFIG_PATH=$dir/lib/pkgconfig -@_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@` +for arg in $@ ; do + case "$arg" in + -showconfig) + showconfigure + exit $status + ;; + *) + @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@` + status=$? + exit $status + ;; + esac +done diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index a9354b4..1b25355 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -49,6 +49,13 @@ New Features Configuration: ------------- + - Added new option to the h5cc scripts produced by CMake. + + Add -showconfig option to h5cc scripts to cat the + libhdf5-settings to the standard output. + + (ADB - 2022/03/11) + - Changed autotools and CMake configurations to derive both compilation warnings-as-errors and warnings-only-warn configurations from the same files, 'config/*/*error*'. Removed redundant files |