summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-12-17 01:39:09 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2019-12-17 01:39:09 +0200
commitada0c36b73b030ce16b14cdbf455fe1daf709e19 (patch)
treed30027df2370e593ca0771d463b9d3ad9a3f08db
parent3350763bc17f45674c81d9c93dffc9316c8a4c4e (diff)
downloadmeson-osxfixes.tar.gz
Fail gracefully detecting hdf5 if pkg-config is not available.osxfixes
-rw-r--r--mesonbuild/dependencies/hdf5.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py
index b73e424ad..1ceb15fe9 100644
--- a/mesonbuild/dependencies/hdf5.py
+++ b/mesonbuild/dependencies/hdf5.py
@@ -33,14 +33,17 @@ class HDF5Dependency(ExternalDependency):
# 1. pkg-config
pkgconfig_files = ['hdf5', 'hdf5-serial']
# some distros put hdf5-1.2.3.pc with version number in .pc filename.
- ret = subprocess.run(['pkg-config', '--list-all'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
- universal_newlines=True)
- if ret.returncode == 0:
- for pkg in ret.stdout.split('\n'):
- if pkg.startswith(('hdf5')):
- pkgconfig_files.append(pkg.split(' ', 1)[0])
- pkgconfig_files = list(set(pkgconfig_files)) # dedupe
-
+ try:
+ ret = subprocess.run(['pkg-config', '--list-all'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
+ universal_newlines=True)
+ if ret.returncode == 0:
+ for pkg in ret.stdout.split('\n'):
+ if pkg.startswith(('hdf5')):
+ pkgconfig_files.append(pkg.split(' ', 1)[0])
+ pkgconfig_files = list(set(pkgconfig_files)) # dedupe
+ except FileNotFoundError:
+ # pkg-config was not available
+ pass
if language not in ('c', 'cpp', 'fortran'):
raise DependencyException('Language {} is not supported with HDF5.'.format(language))