diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-02 14:45:33 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-04 22:28:47 +0000 |
| commit | daaa49c622b12ea354a17822dba687a3c633c748 (patch) | |
| tree | ba5ff29def6576dfd69d57bc2ec4e2af0d95b4cb /mesonbuild/dependencies | |
| parent | 590b6dec9723a9f2c7f11acb7c3a7701370bb72a (diff) | |
| download | meson-daaa49c622b12ea354a17822dba687a3c633c748.zip meson-daaa49c622b12ea354a17822dba687a3c633c748.tar.gz meson-daaa49c622b12ea354a17822dba687a3c633c748.tar.bz2 | |
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
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 9758cc5..2f31196 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() |