Fixes for compiler wrappers and cmake config file dirs. (#5361)

* h5cc: Fix location of settings and pkgconfig files

In h5cc and other compiler wrappers, drop hardcoded 'lib' as the dir for
libhdf5.settings and pkgconfig scripts and use cmake computed values for
HDF5_INSTALL_LIB_DIR. This fixes issues on systems where the libdir is
'lib64' for instance, as on 64-bit Linux OSes, and 'lib' in the
wrappers point to incorrect locations of the settings and pkgconfig
files.

* h5cc: Drop -show from output when calling command.

When calling `h5cc -show FOO`, the output should not repeat the '-show'
argument itself. This commit fixes the '-show' command invoked from a
cmake built h5cc to be consistent with an (previously) autotools built
one.
This commit is contained in:
Atri Bhattacharya 2025-03-12 23:47:41 +05:30 committed by GitHub
parent 4b609617f6
commit 41a7ef8e1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -32,7 +32,7 @@ pc_args=""
# libhdf5.settings file residing in the lib directory.
showconfigure()
{
cat $dir/lib/libhdf5.settings
cat $dir/@HDF5_INSTALL_LIB_DIR@/libhdf5.settings
status=$?
}
@ -57,7 +57,7 @@ usage() {
exit $EXIT_FAILURE
}
export PKG_CONFIG_PATH=$dir/lib/pkgconfig
export PKG_CONFIG_PATH=$dir/@HDF5_INSTALL_LIB_DIR@/pkgconfig
for arg in $@ ; do
case "$arg" in
@ -66,7 +66,7 @@ for arg in $@ ; do
exit $status
;;
-show)
echo @_PKG_CONFIG_COMPILER@ $@ `pkg-config $pc_args --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
echo @_PKG_CONFIG_COMPILER@ ${@:2} `pkg-config $pc_args --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
exit $status
;;
-help)