From d94f64ded1382ff768ce2c2900a8e6efcf3a11fb Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 2 Jan 2017 18:58:05 +0200 Subject: Support default_options in dependency() fallbacks. --- mesonbuild/interpreter.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mesonbuild') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 77145b1..92f8af8 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1798,7 +1798,12 @@ requirements use the version keyword argument instead.''') dirname, varname = self.get_subproject_infos(kwargs) # Try to execute the subproject try: - self.do_subproject(dirname, {}) + sp_kwargs = {} + try: + sp_kwargs['default_options'] = kwargs['default_options'] + except KeyError: + pass + self.do_subproject(dirname, sp_kwargs) # Invalid code is always an error except InvalidCode: raise -- cgit v1.1