diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-02-28 15:44:39 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-03-03 10:29:14 -0800 |
| commit | 4a2058cb836242a6423870e671b6b76fa48167f3 (patch) | |
| tree | 709d4ebeaf2517d975e849e45d4482b51b0b61ec /mesonbuild/interpreter/dependencyfallbacks.py | |
| parent | 71c65392a83f3f293fa70e7fadc610f95a8e8d4e (diff) | |
| download | meson-4a2058cb836242a6423870e671b6b76fa48167f3.zip meson-4a2058cb836242a6423870e671b6b76fa48167f3.tar.gz meson-4a2058cb836242a6423870e671b6b76fa48167f3.tar.bz2 | |
interpreter: use typed_kwargs for subproject()
Diffstat (limited to 'mesonbuild/interpreter/dependencyfallbacks.py')
| -rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index 8a0d351..e029854 100644 --- a/mesonbuild/interpreter/dependencyfallbacks.py +++ b/mesonbuild/interpreter/dependencyfallbacks.py @@ -4,7 +4,7 @@ from .. import mlog from .. import dependencies from .. import build from ..wrap import WrapMode -from ..mesonlib import OptionKey, extract_as_list, stringlistify, version_compare_many +from ..mesonlib import OptionKey, extract_as_list, stringlistify, version_compare_many, listify from ..dependencies import Dependency, DependencyException, NotFoundDependency from ..interpreterbase import (MesonInterpreterObject, FeatureNew, InterpreterException, InvalidArguments, @@ -131,6 +131,9 @@ class DependencyFallbacksHolder(MesonInterpreterObject): # Configure the subproject subp_name = self.subproject_name varname = self.subproject_varname + func_kwargs.setdefault('version', []) + if 'default_options' in kwargs and isinstance(kwargs['default_options'], str): + func_kwargs['default_options'] = listify(kwargs['default_options']) self.interpreter.do_subproject(subp_name, 'meson', func_kwargs) return self._get_subproject_dep(subp_name, varname, kwargs) |