From 4f4259de1b0d40c385d017675245e5d662017d0e Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 11 Nov 2021 18:11:48 -0500 Subject: hdf5 dependency: check for alternative config-tool names Depending on whether hdf5 is compiled with parallel support, the same config-tool program may be installed with a mysterious "p" in the name. In this case, dependency lookup will totally fail, unless of course you use the superior pkg-config interface in which case you get a predictable name. Work around this insanity by checking for both types of config-tool name. Fixes #9555 --- mesonbuild/dependencies/hdf5.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index 9687b36..78ef9d6 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -96,13 +96,13 @@ class HDF5ConfigToolDependency(ConfigToolDependency): if language == 'c': cenv = 'CC' - tools = ['h5cc'] + tools = ['h5cc', 'h5pcc'] elif language == 'cpp': cenv = 'CXX' - tools = ['h5c++'] + tools = ['h5c++', 'h5pc++'] elif language == 'fortran': cenv = 'FC' - tools = ['h5fc'] + tools = ['h5fc', 'h5pfc'] else: raise DependencyException('How did you get here?') -- cgit v1.1