diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-10-04 00:07:44 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-09-13 13:54:47 -0400 |
| commit | 9d338200dacdf24c50259c309380200f8a53d5b5 (patch) | |
| tree | 8e268a9357119265f11b30791f56e8e09fec393e /mesonbuild/interpreter.py | |
| parent | 19696c3dcdb379f4c5b88457f43242f2d33427a0 (diff) | |
| download | meson-9d338200dacdf24c50259c309380200f8a53d5b5.zip meson-9d338200dacdf24c50259c309380200f8a53d5b5.tar.gz meson-9d338200dacdf24c50259c309380200f8a53d5b5.tar.bz2 | |
external-project: New module to build configure/make projects
This adds an experimental meson module to build projects with other
build systems.
Closes: #4316
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 99a2916..bc162ac 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2505,6 +2505,8 @@ class Interpreter(InterpreterBase): return ExternalProgramHolder(item, self.subproject) elif hasattr(item, 'held_object'): return item + elif isinstance(item, InterpreterObject): + return item else: raise InterpreterException('Module returned a value of unknown type.') @@ -2530,6 +2532,8 @@ class Interpreter(InterpreterBase): # FIXME: This is special cased and not ideal: # The first source is our new VapiTarget, the rest are deps self.process_new_values(v.sources[0]) + elif isinstance(v, InstallDir): + self.build.install_dirs.append(v) elif hasattr(v, 'held_object'): pass elif isinstance(v, (int, str, bool, Disabler)): |