diff options
| author | Wade Berrier <wberrier@gmail.com> | 2017-04-18 16:53:41 -0600 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-29 12:23:49 +0300 |
| commit | f2465e6545332d803973b21792a3d9db17ed9577 (patch) | |
| tree | 9f10a588f177663cb74858c0dcb230a379839041 /mesonbuild/dependencies.py | |
| parent | 3e2c3c9ff052736a05554fb8f14cf21e05c3bab5 (diff) | |
| download | meson-f2465e6545332d803973b21792a3d9db17ed9577.zip meson-f2465e6545332d803973b21792a3d9db17ed9577.tar.gz meson-f2465e6545332d803973b21792a3d9db17ed9577.tar.bz2 | |
dependencies: qt: qmake method: prefer QT_HOST_BINS over QT_INSTALL_BINS
When cross compiling and looking for moc/uic/rcc you really want the
host binary.
Still fall back to QT_INSTALL_BINS as it appears that's the only
variable available with qt4.
Diffstat (limited to 'mesonbuild/dependencies.py')
| -rw-r--r-- | mesonbuild/dependencies.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 04a22f9..eb7a5e4 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -1136,7 +1136,7 @@ class QtBaseDependency(Dependency): self.cargs.append('-I' + incdir) libdir = qvars['QT_INSTALL_LIBS'] # Used by self.compilers_detect() - self.bindir = qvars['QT_INSTALL_BINS'] + self.bindir = self.get_qmake_host_bins(qvars) self.is_found = True for module in mods: mincdir = os.path.join(incdir, 'Qt' + module) @@ -1168,7 +1168,15 @@ class QtBaseDependency(Dependency): self.cargs += fwdep.get_compile_args() self.largs += fwdep.get_link_args() # Used by self.compilers_detect() - self.bindir = qvars['QT_INSTALL_BINS'] + self.bindir = self.get_qmake_host_bins(qvars) + + def get_qmake_host_bins(self, qvars): + # Prefer QT_HOST_BINS (qt5, correct for cross and native compiling) + # but fall back to QT_INSTALL_BINS (qt4) + if 'QT_HOST_BINS' in qvars: + return qvars['QT_HOST_BINS'] + else: + return qvars['QT_INSTALL_BINS'] def get_version(self): return self.version |