diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-03-24 18:34:19 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-25 20:30:15 +0200 |
| commit | 3bb3c9ce52fe10025df04b7aeb169a3981f73377 (patch) | |
| tree | 59d9de73109fbd69b7e894e5f1b27e996787ed16 /mesonbuild/interpreter.py | |
| parent | 9adef3a8e878958d8408f717efb68e1d36ab3984 (diff) | |
| download | meson-3bb3c9ce52fe10025df04b7aeb169a3981f73377.zip meson-3bb3c9ce52fe10025df04b7aeb169a3981f73377.tar.gz meson-3bb3c9ce52fe10025df04b7aeb169a3981f73377.tar.bz2 | |
declare_dependency: flatten dependencies kwargs allowing [] as no-op dep
An empty / no-op dependency can be expressed as []. This works with
the dependencies kwarg in executable targets such as shared_library,
but now with declare_dependency, where it would error out with
"error: Dependencies must be external deps" because the deps are
not flattened in this case. This patch fixes that.
Fixes #1500
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 6e8cf1a..5d3c095 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1407,7 +1407,7 @@ class Interpreter(InterpreterBase): if not isinstance(sources, list): sources = [sources] sources = self.source_strings_to_files(self.flatten(sources)) - deps = kwargs.get('dependencies', []) + deps = self.flatten(kwargs.get('dependencies', [])) if not isinstance(deps, list): deps = [deps] compile_args = mesonlib.stringlistify(kwargs.get('compile_args', [])) |