aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-11-02 11:41:58 -0700
committerGitHub <noreply@github.com>2016-11-02 11:41:58 -0700
commit36a0d162cb65ee6470ed3d6b5e610de8f93b7a9d (patch)
treec522a1016829d93e6e36a84f20423c573f52b70e /mesonbuild/interpreter.py
parent97c2321740602ed43a5fbf0ca2cad53a2a622cee (diff)
parentbae7d7b3d7ed524083455d451c87fcb1b1e2854f (diff)
downloadmeson-36a0d162cb65ee6470ed3d6b5e610de8f93b7a9d.zip
meson-36a0d162cb65ee6470ed3d6b5e610de8f93b7a9d.tar.gz
meson-36a0d162cb65ee6470ed3d6b5e610de8f93b7a9d.tar.bz2
Merge pull request #895 from mesonbuild/wip/tingping/gnome-vapi
gnome: Add generate_vapi function
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 26c8aef..5203528 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -990,6 +990,7 @@ class ModuleHolder(InterpreterObject):
state.project_version = self.interpreter.build.dep_manifest[self.interpreter.active_projectname]
state.compilers = self.interpreter.build.compilers
state.targets = self.interpreter.build.targets
+ state.data = self.interpreter.build.data
state.headers = self.interpreter.build.get_headers()
state.man = self.interpreter.build.get_man()
state.global_args = self.interpreter.build.global_args
@@ -1269,6 +1270,11 @@ class Interpreter():
self.build.install_scripts.append(v)
elif isinstance(v, build.Data):
self.build.data.append(v)
+ elif isinstance(v, dependencies.InternalDependency):
+ # FIXME: This is special cased and not ideal:
+ # The first source is our new VapiTarget, the rest are deps
+ self.module_method_callback(v.sources[0])
+ outvalues.append(InternalDependencyHolder(v))
else:
print(v)
raise InterpreterException('Module returned a value of unknown type.')