diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-11-11 18:11:48 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-11-17 23:07:14 +0200 |
| commit | 4f4259de1b0d40c385d017675245e5d662017d0e (patch) | |
| tree | a4a05d5c78906b3afb5b06185e34491e06e5f137 /mesonbuild/dependencies | |
| parent | 018d928cf51b6915f72d8377fe77b89dbd594072 (diff) | |
| download | meson-4f4259de1b0d40c385d017675245e5d662017d0e.zip meson-4f4259de1b0d40c385d017675245e5d662017d0e.tar.gz meson-4f4259de1b0d40c385d017675245e5d662017d0e.tar.bz2 | |
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
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 6 |
1 files 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?') |