diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-03 13:05:35 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-03 13:05:35 +0300 |
| commit | 1cc57c4f3aa375297ba4373a291ab70d1259980e (patch) | |
| tree | cc208fcac6e2390c82028428cab3866868c37432 | |
| parent | e87d3c07ad3943ccd7a17f01ff900136c8a394c6 (diff) | |
| download | meson-1cc57c4f3aa375297ba4373a291ab70d1259980e.zip meson-1cc57c4f3aa375297ba4373a291ab70d1259980e.tar.gz meson-1cc57c4f3aa375297ba4373a291ab70d1259980e.tar.bz2 | |
Error out if required framework dep is not found.
| -rw-r--r-- | dependencies.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py index c276458..71cb0a7 100644 --- a/dependencies.py +++ b/dependencies.py @@ -593,7 +593,6 @@ class GnuStepDependency(Dependency): try: gp = subprocess.Popen([confprog, '--help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - gp.communicate() except FileNotFoundError: self.args = None @@ -782,7 +781,10 @@ def find_external_dependency(name, kwargs): except Exception as e: pkg_exc = e if mesonlib.is_osx(): - return ExtraFrameworkDependency(name, required) + fwdep = ExtraFrameworkDependency(name, required) + if required and not fwdep.found(): + raise DependencyException('Dependency "%s" nod found' % name) + return fwdep if pkg_exc is not None: raise pkg_exc return pkgdep |