diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-21 21:57:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-21 21:57:05 +0300 |
commit | e9bd7d49bdc8c630cca3bf4cc02c437841b6aaf6 (patch) | |
tree | 3a7c2127d8ca71027248589d5d326c3bb23ace35 /mesonbuild/interpreter.py | |
parent | 60f34a1f51d455598143c1c55fd49a5eb1bb1fd6 (diff) | |
parent | 27b6c62ffdf51fed9a55ecfdd4ed47ac2ea79c1e (diff) | |
download | meson-e9bd7d49bdc8c630cca3bf4cc02c437841b6aaf6.zip meson-e9bd7d49bdc8c630cca3bf4cc02c437841b6aaf6.tar.gz meson-e9bd7d49bdc8c630cca3bf4cc02c437841b6aaf6.tar.bz2 |
Merge pull request #5372 from dcbaker/get_variable
Dependency.get_variable method
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index cb3aa8a..30be5ae 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -384,6 +384,7 @@ class DependencyHolder(InterpreterObject, ObjectHolder): 'name': self.name_method, 'get_pkgconfig_variable': self.pkgconfig_method, 'get_configtool_variable': self.configtool_method, + 'get_variable': self.variable_method, 'partial_dependency': self.partial_dependency_method, }) @@ -440,13 +441,21 @@ class DependencyHolder(InterpreterObject, ObjectHolder): pdep = self.held_object.get_partial_dependency(**kwargs) return DependencyHolder(pdep, self.subproject) + @FeatureNew('dep.get_variable', '0.51.0') + @noPosargs + @permittedKwargs({'cmake', 'pkgconfig', 'configtool', 'default', 'pkgconfig_define'}) + def variable_method(self, args, kwargs): + return self.held_object.get_variable(**kwargs) + + class InternalDependencyHolder(InterpreterObject, ObjectHolder): def __init__(self, dep, pv): InterpreterObject.__init__(self) ObjectHolder.__init__(self, dep, pv) self.methods.update({'found': self.found_method, - 'version': self.version_method, + 'get_variable': self.variable_method, 'partial_dependency': self.partial_dependency_method, + 'version': self.version_method, }) @noPosargs @@ -466,6 +475,13 @@ class InternalDependencyHolder(InterpreterObject, ObjectHolder): pdep = self.held_object.get_partial_dependency(**kwargs) return DependencyHolder(pdep, self.subproject) + @FeatureNew('dep.get_variable', '0.51.0') + @noPosargs + @permittedKwargs({'cmake', 'pkgconfig', 'configtool', 'default_variable', 'pkgconfig_define'}) + def variable_method(self, args, kwargs): + return self.held_object.get_variable(**kwargs) + + class ExternalProgramHolder(InterpreterObject, ObjectHolder): def __init__(self, ep): InterpreterObject.__init__(self) |