From daaa49c622b12ea354a17822dba687a3c633c748 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 2 Mar 2018 14:45:33 +0000 Subject: [PATCH] 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 --- mesonbuild/dependencies/ui.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 9758cc560..2f31196e4 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -320,10 +320,15 @@ class QtBaseDependency(ExternalDependency): def _framework_detect(self, qvars, modules, kwargs): libdir = qvars['QT_INSTALL_LIBS'] + + # ExtraFrameworkDependency doesn't support any methods + fw_kwargs = kwargs.copy() + fw_kwargs.pop('method', None) + for m in modules: fname = 'Qt' + m fwdep = ExtraFrameworkDependency(fname, False, libdir, self.env, - self.language, kwargs) + self.language, fw_kwargs) self.compile_args.append('-F' + libdir) if fwdep.found(): self.compile_args += fwdep.get_compile_args()