aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/base.py
diff options
context:
space:
mode:
authorMarvin Scholz <epirat07@gmail.com>2019-07-15 12:10:57 +0200
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2019-11-07 17:50:00 +0530
commitfc86339b39cfb13f084b943597cd4ee14b58f9d8 (patch)
treebeb51b3e0091ff47ac014b523d4ceb412226aa2b /mesonbuild/dependencies/base.py
parent4c96aa34cb415ca654c0571280386880e9d14ca3 (diff)
downloadmeson-fc86339b39cfb13f084b943597cd4ee14b58f9d8.zip
meson-fc86339b39cfb13f084b943597cd4ee14b58f9d8.tar.gz
meson-fc86339b39cfb13f084b943597cd4ee14b58f9d8.tar.bz2
dependencies/pkgconfig: Fix found state ignoring errors
Previously even when meson failed to obtain cflags or libs for a dependency it would lead to the dependency being found, causing very confusing errors at build time.
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r--mesonbuild/dependencies/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 032672d..6f4552b 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -649,6 +649,8 @@ class PkgConfigDependency(ExternalDependency):
if ret != 0:
return
+ self.is_found = True
+
try:
# Fetch cargs to be used while using this dependency
self._set_cargs()
@@ -663,8 +665,6 @@ class PkgConfigDependency(ExternalDependency):
self.is_found = False
self.reason = e
- self.is_found = True
-
def __repr__(self):
s = '<{0} {1}: {2} {3}>'
return s.format(self.__class__.__name__, self.name, self.is_found,