From fc86339b39cfb13f084b943597cd4ee14b58f9d8 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Mon, 15 Jul 2019 12:10:57 +0200 Subject: 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. --- mesonbuild/dependencies/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild') 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, -- cgit v1.1