Fix "meson 'test cases/frameworks/4 qt master' _build -Dmethod=qmake" on OSX

ExtraFrameworkDependency doesn't support any method: other than auto, so
handing down the method: used from QtBaseDependency leads to (sic):

meson.build:13:2: ERROR: Unsupported detection method: qmake, allowed methods are auto and auto
pull/3165/head
Jon Turney 7 years ago
parent 590b6dec97
commit daaa49c622
  1. 7
      mesonbuild/dependencies/ui.py

@ -320,10 +320,15 @@ class QtBaseDependency(ExternalDependency):
def _framework_detect(self, qvars, modules, kwargs): def _framework_detect(self, qvars, modules, kwargs):
libdir = qvars['QT_INSTALL_LIBS'] libdir = qvars['QT_INSTALL_LIBS']
# ExtraFrameworkDependency doesn't support any methods
fw_kwargs = kwargs.copy()
fw_kwargs.pop('method', None)
for m in modules: for m in modules:
fname = 'Qt' + m fname = 'Qt' + m
fwdep = ExtraFrameworkDependency(fname, False, libdir, self.env, fwdep = ExtraFrameworkDependency(fname, False, libdir, self.env,
self.language, kwargs) self.language, fw_kwargs)
self.compile_args.append('-F' + libdir) self.compile_args.append('-F' + libdir)
if fwdep.found(): if fwdep.found():
self.compile_args += fwdep.get_compile_args() self.compile_args += fwdep.get_compile_args()

Loading…
Cancel
Save