diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-02-26 18:12:41 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-04 22:28:47 +0000 |
| commit | 02def38741d5bf9701b463a77accce37e679cc9e (patch) | |
| tree | 69b7417a1fc0f1c319107162d97e6d1253c6b0ed | |
| parent | 610e5d4a7122964d2e14c3c77585ce478704f976 (diff) | |
| download | meson-02def38741d5bf9701b463a77accce37e679cc9e.zip meson-02def38741d5bf9701b463a77accce37e679cc9e.tar.gz meson-02def38741d5bf9701b463a77accce37e679cc9e.tar.bz2 | |
Fix QtBaseDependency._framework_detect
At the moment, QtBaseDependency._framework_detect sets is_found if at least
one module is found. This gives the incorrect result in the case where both
found and not-found modules are given.
Fix it so it only sets is_found if all the modules given are found.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index bc3eafc..8960d50 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -325,9 +325,12 @@ class QtBaseDependency(ExternalDependency): self.language, kwargs) self.compile_args.append('-F' + libdir) if fwdep.found(): - self.is_found = True self.compile_args += fwdep.get_compile_args() self.link_args += fwdep.get_link_args() + else: + break + else: + self.is_found = True # Used by self.compilers_detect() self.bindir = self.get_qmake_host_bins(qvars) |