aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-08 11:34:08 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-10 10:55:58 -0700
commitd770f1c8151cf91b755ae496a66c2b4ac0b83dfa (patch)
tree46ab0e916cc0a6245419a3d4006363b6fdf4b7a4 /mesonbuild/interpreter.py
parentc81804e5f2c3968280cad3bea0193ba34190472d (diff)
downloadmeson-d770f1c8151cf91b755ae496a66c2b4ac0b83dfa.zip
meson-d770f1c8151cf91b755ae496a66c2b4ac0b83dfa.tar.gz
meson-d770f1c8151cf91b755ae496a66c2b4ac0b83dfa.tar.bz2
interpreter: Add get_variable method to dependency holders
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index fe12a7b..2a729da 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -383,6 +383,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,
})
@@ -439,13 +440,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
@@ -465,6 +474,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', '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)