diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-02 18:58:05 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-02 18:58:05 +0200 |
| commit | d94f64ded1382ff768ce2c2900a8e6efcf3a11fb (patch) | |
| tree | 766ed69d53baef83f597020beb6da3bdd7e87a2f | |
| parent | d716d53b3204bab94894f26adab84840e4ba4a53 (diff) | |
| download | meson-d94f64ded1382ff768ce2c2900a8e6efcf3a11fb.zip meson-d94f64ded1382ff768ce2c2900a8e6efcf3a11fb.tar.gz meson-d94f64ded1382ff768ce2c2900a8e6efcf3a11fb.tar.bz2 | |
Support default_options in dependency() fallbacks.
| -rw-r--r-- | mesonbuild/interpreter.py | 7 |
1 files changed, 6 insertions, 1 deletions
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 |