diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-11 16:41:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 16:41:56 +0300 |
| commit | 42d1661bd9d4a29d8780e77127542120624d3729 (patch) | |
| tree | f40d39bf9418499d2296e8c227c00f015bc9bf2b /mesonbuild/modules/qt4.py | |
| parent | 371e3d3e87bff5413554bbfc01250a899288400c (diff) | |
| parent | 1fbf6300c5d38b12a4347a9327e54a9a315ef8de (diff) | |
| download | meson-42d1661bd9d4a29d8780e77127542120624d3729.zip meson-42d1661bd9d4a29d8780e77127542120624d3729.tar.gz meson-42d1661bd9d4a29d8780e77127542120624d3729.tar.bz2 | |
Merge pull request #1588 from absmall/method
Add an option to dependencies called 'method'.
Diffstat (limited to 'mesonbuild/modules/qt4.py')
| -rw-r--r-- | mesonbuild/modules/qt4.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 7146739..0386291 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -24,14 +24,14 @@ from . import ModuleReturnValue class Qt4Module(ExtensionModule): tools_detected = False - def _detect_tools(self, env): + def _detect_tools(self, env, method): if self.tools_detected: return mlog.log('Detecting Qt4 tools') # FIXME: We currently require Qt4 to exist while importing the module. # We should make it gracefully degrade and not create any targets if # the import is marked as 'optional' (not implemented yet) - kwargs = {'required': 'true', 'modules': 'Core', 'silent': 'true'} + kwargs = {'required': 'true', 'modules': 'Core', 'silent': 'true', 'method': method} qt4 = Qt4Dependency(env, kwargs) # Get all tools and then make sure that they are the right version self.moc, self.uic, self.rcc = qt4.compilers_detect() @@ -113,7 +113,8 @@ class Qt4Module(ExtensionModule): if not isinstance(sources, list): sources = [sources] sources += args[1:] - self._detect_tools(state.environment) + method = kwargs.get('method', 'auto') + self._detect_tools(state.environment, method) err_msg = "{0} sources specified and couldn't find {1}, " \ "please check your qt4 installation" if len(moc_headers) + len(moc_sources) > 0 and not self.moc.found(): |