aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter/interpreter.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-09-30 15:15:04 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-09-30 17:49:15 -0400
commit4deeb907b613760754c5be20e1af019d76b78515 (patch)
treee29d9a39b91576c7e0c80b8fdbb15b8c69488e83 /mesonbuild/interpreter/interpreter.py
parentd5b0673079728225f8dbfb7e0f9a5b18f04ffd73 (diff)
downloadmeson-4deeb907b613760754c5be20e1af019d76b78515.zip
meson-4deeb907b613760754c5be20e1af019d76b78515.tar.gz
meson-4deeb907b613760754c5be20e1af019d76b78515.tar.bz2
dependency: Allow searching for multiple names
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
-rw-r--r--mesonbuild/interpreter/interpreter.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index c5997f2..11f2970 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -1490,10 +1490,12 @@ external dependencies (including libraries) must go to "dependencies".''')
@FeatureNewKwargs('dependency', '0.38.0', ['default_options'])
@disablerIfNotFound
@permittedKwargs(permitted_dependency_kwargs)
- @typed_pos_args('dependency', str)
+ @typed_pos_args('dependency', varargs=str, min_varargs=1)
def func_dependency(self, node, args, kwargs):
# Replace '' by empty list of names
- names = [args[0]] if args[0] else []
+ names = [n for n in args[0] if n]
+ if len(names) > 1:
+ FeatureNew('dependency with more than one name', '0.60.0').use(self.subproject)
allow_fallback = kwargs.get('allow_fallback')
if allow_fallback is not None and not isinstance(allow_fallback, bool):
raise InvalidArguments('"allow_fallback" argument must be boolean')