From 9dc35264c768a9c9869946ab987a1a66f9540c35 Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Fri, 11 Mar 2022 13:29:58 -0600 Subject: 1 12 Add -showconfig to h5cc scripts to dump libhdf5.settings file (#1482) * Merge Add -showconfig to h5cc scripts to dump libhdf5.settings file * Added note * Fix comments --- config/cmake/libh5cc.in | 23 ++++++++++++++++++++++- release_docs/RELEASE.txt | 7 +++++++ 2 files changed, 29 insertions(+), 1 deletion(-) 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 42527a2..6954718 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -47,6 +47,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) + - Refactored the utils folder. Added subfolder test and moved the 'swmr_check_compat_vfd.c file' -- cgit v0.12