diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-03 22:48:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-03 22:48:56 +0200 |
| commit | cf76ffad145eb83a0bbfce89e05b7610637ff293 (patch) | |
| tree | 9d76dd2d2f2398fbca00bdfad434297246338213 /mesonbuild/dependencies/ui.py | |
| parent | 2cf1e8da15b954725fa9c9467bfb35a516814c89 (diff) | |
| parent | bccb7a8eb8f13fc747f5198ee0d77ecaf1b77be7 (diff) | |
| download | meson-cf76ffad145eb83a0bbfce89e05b7610637ff293.zip meson-cf76ffad145eb83a0bbfce89e05b7610637ff293.tar.gz meson-cf76ffad145eb83a0bbfce89e05b7610637ff293.tar.bz2 | |
Merge pull request #2703 from mesonbuild/msvc-library-search-fixes
Various MSVC library search fixes
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index dd04580..bf74029 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -218,7 +218,8 @@ class QtBaseDependency(ExternalDependency): kwargs['required'] = False modules = OrderedDict() for module in mods: - modules[module] = PkgConfigDependency(self.qtpkgname + module, self.env, kwargs) + modules[module] = PkgConfigDependency(self.qtpkgname + module, self.env, + kwargs, language=self.language) for m in modules.values(): if not m.found(): self.is_found = False @@ -232,7 +233,8 @@ class QtBaseDependency(ExternalDependency): core = modules['Core'] else: corekwargs = {'required': 'false', 'silent': 'true'} - core = PkgConfigDependency(self.qtpkgname + 'Core', self.env, corekwargs) + core = PkgConfigDependency(self.qtpkgname + 'Core', self.env, corekwargs, + language=self.language) # Used by self.compilers_detect() self.bindir = self.get_pkgconfig_host_bins(core) if not self.bindir: |