aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-01-17 13:33:34 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-01-17 15:39:01 +0530
commit2d31851d3b21f5a377f59fe1c1afa4294ce9167e (patch)
tree5958a37c28416b38e39ad7595059888643aa7390
parente441a7428240995cc85c695189f01e757f01f610 (diff)
downloadmeson-2d31851d3b21f5a377f59fe1c1afa4294ce9167e.zip
meson-2d31851d3b21f5a377f59fe1c1afa4294ce9167e.tar.gz
meson-2d31851d3b21f5a377f59fe1c1afa4294ce9167e.tar.bz2
Print pkg-config error when framework dep isn't found
Without this, macOS users can't figure out why a particular dependency wasn't found because the pkg-config error message gets masked by the fresh and useless DependencyException.
-rw-r--r--mesonbuild/dependencies.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
index e11fd57..e583044 100644
--- a/mesonbuild/dependencies.py
+++ b/mesonbuild/dependencies.py
@@ -1443,7 +1443,9 @@ def find_external_dependency(name, environment, kwargs):
if mesonlib.is_osx():
fwdep = ExtraFrameworkDependency(name, required)
if required and not fwdep.found():
- raise DependencyException('Dependency "%s" not found' % name)
+ m = 'Dependency {!r} not found, tried Extra Frameworks ' \
+ 'and Pkg-Config:\n\n' + str(pkg_exc)
+ raise DependencyException(m.format(name))
return fwdep
if pkg_exc is not None:
raise pkg_exc