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.
pull/3165/head
Jon Turney 7 years ago
parent 610e5d4a71
commit 02def38741
  1. 5
      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)

Loading…
Cancel
Save