diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-08-31 14:13:50 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2023-09-08 13:08:05 +0530 |
| commit | 6cfd2b4d5bd30b372268c25308b1cb00afd0996d (patch) | |
| tree | 0832257429d96a591668b0e737b2647c1ed6a227 /mesonbuild | |
| parent | 204fe3c5772f3f6ec9583fb9216412a4eb6018b9 (diff) | |
| download | meson-6cfd2b4d5bd30b372268c25308b1cb00afd0996d.zip meson-6cfd2b4d5bd30b372268c25308b1cb00afd0996d.tar.gz meson-6cfd2b4d5bd30b372268c25308b1cb00afd0996d.tar.bz2 | |
Override config-tool get_variable args for qmake
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/dependencies/configtool.py | 5 | ||||
| -rw-r--r-- | mesonbuild/dependencies/qt.py | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/configtool.py b/mesonbuild/dependencies/configtool.py index 5a4294e..8dda298 100644 --- a/mesonbuild/dependencies/configtool.py +++ b/mesonbuild/dependencies/configtool.py @@ -150,8 +150,11 @@ class ConfigToolDependency(ExternalDependency): return [] return split_args(out) + def get_variable_args(self, variable_name: str) -> T.List[str]: + return [f'--{variable_name}'] + def get_configtool_variable(self, variable_name: str) -> str: - p, out, _ = Popen_safe(self.config + [f'--{variable_name}']) + p, out, _ = Popen_safe(self.config + self.get_variable_args(variable_name)) if p.returncode != 0: if self.required: raise DependencyException( diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index 1a86bd2..ceb0321 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -350,6 +350,9 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta): return m.group(0).rstrip('.') return version + def get_variable_args(self, variable_name: str) -> T.List[str]: + return ['-query', f'{variable_name}'] + @abc.abstractmethod def get_private_includes(self, mod_inc_dir: str, module: str) -> T.List[str]: pass |