diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-31 17:07:07 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-01 00:14:09 +0530 |
| commit | bd8eff74385c317c14dfd28a13c592e096bead8e (patch) | |
| tree | d68c5fde66c4f1bee71d4e23d0356e63d22200b9 /mesonbuild/dependencies/ui.py | |
| parent | c0166355ceef5168b2f7b3c6cbace32e8dbafbb4 (diff) | |
| download | meson-bd8eff74385c317c14dfd28a13c592e096bead8e.zip meson-bd8eff74385c317c14dfd28a13c592e096bead8e.tar.gz meson-bd8eff74385c317c14dfd28a13c592e096bead8e.tar.bz2 | |
qtdep: Look for QMAKE env var again + sprinkle debug
We used to look for the QMAKE env var in earlier versions of Meson,
start looking for it again.
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 0585be9..a0d8c1b 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -216,9 +216,11 @@ class QtBaseDependency(ExternalDependency): methods = [] # Prefer pkg-config, then fallback to `qmake -query` if DependencyMethods.PKGCONFIG in self.methods: + mlog.debug('Trying to find qt with pkg-config') self._pkgconfig_detect(mods, kwargs) methods.append('pkgconfig') if not self.is_found and DependencyMethods.QMAKE in self.methods: + mlog.debug('Trying to find qt with qmake') self.from_text = self._qmake_detect(mods, kwargs) methods.append('qmake-' + self.name) methods.append('qmake') @@ -442,6 +444,7 @@ class QtBaseDependency(ExternalDependency): for m in modules: fname = 'Qt' + m + mlog.debug('Looking for qt framework ' + fname) fwdep = QtExtraFrameworkDependency(fname, False, [libdir], self.env, self.language, fw_kwargs) self.compile_args.append('-F' + libdir) |