diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-29 16:16:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-01 07:27:35 +0000 |
| commit | 8a7537ce2469d755e471edc532740df07a0f8e45 (patch) | |
| tree | 6a1ceb8f1f2159aec8cf767c35de5adf0827495c | |
| parent | 8821c0aadcc901f1a624e082a59a385ed6725d98 (diff) | |
| download | meson-8a7537ce2469d755e471edc532740df07a0f8e45.zip meson-8a7537ce2469d755e471edc532740df07a0f8e45.tar.gz meson-8a7537ce2469d755e471edc532740df07a0f8e45.tar.bz2 | |
qt: Only look for a framework on macOS if building for macOS
When building for iOS, the Qt binaries only contain static libraries
and headers. No framework.
With this, Meson can successfully compile and link to Qt on iOS
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index a0d8c1b..ce1ca68 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -373,7 +373,9 @@ class QtBaseDependency(ExternalDependency): continue (k, v) = tuple(line.split(':', 1)) qvars[k] = v - if mesonlib.is_osx(): + # Qt on macOS uses a framework, but Qt for iOS does not + if self.env.machines.host.is_darwin() and 'ios' not in qvars['QMAKE_XSPEC']: + mlog.debug("Building for macOS, looking for framework") self._framework_detect(qvars, mods, kwargs) return qmake incdir = qvars['QT_INSTALL_HEADERS'] |