diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-17 13:27:31 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-03-18 08:37:44 -0400 |
| commit | 848e360450c397f1dcfc4d8d3f614df05806699a (patch) | |
| tree | 8115c94c08608b28f730daeb42bcebd2fa3e2aef /mesonbuild/interpreter.py | |
| parent | c756d9789558d7100383759e4f2aa8d4b2321620 (diff) | |
| download | meson-848e360450c397f1dcfc4d8d3f614df05806699a.zip meson-848e360450c397f1dcfc4d8d3f614df05806699a.tar.gz meson-848e360450c397f1dcfc4d8d3f614df05806699a.tar.bz2 | |
interpreter: Add varname as positional arg in dep.get_variable()
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 7823971..ac0d786 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -512,10 +512,15 @@ class DependencyHolder(InterpreterObject, ObjectHolder[Dependency]): return DependencyHolder(pdep, self.subproject) @FeatureNew('dep.get_variable', '0.51.0') - @noPosargs + @typed_pos_args('dep.get_variable', optargs=[str]) @permittedKwargs({'cmake', 'pkgconfig', 'configtool', 'internal', 'default_value', 'pkgconfig_define'}) @FeatureNewKwargs('dep.get_variable', '0.54.0', ['internal']) - def variable_method(self, args, kwargs): + def variable_method(self, args: T.Tuple[T.Optional[str]], kwargs: T.Dict[str, T.Any]) -> str: + default_varname = args[0] + if default_varname is not None: + FeatureNew('0.58.0', 'Positional argument to dep.get_variable()').use(self.subproject) + for k in ['cmake', 'pkgconfig', 'configtool', 'internal']: + kwargs.setdefault(k, default_varname) return self.held_object.get_variable(**kwargs) @FeatureNew('dep.include_type', '0.52.0') |