diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-20 00:58:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 00:58:08 +0300 |
| commit | 2b3562cc3ad6ac4e98de2c866fbacb009c2fcc69 (patch) | |
| tree | 355e149fa3d839ba2fcff0c8edadb01fe6b694eb /mesonbuild/interpreter.py | |
| parent | 11ebe0bfee31eeacec3d06d95dbc420079d67696 (diff) | |
| parent | 9a82b0136a6b9cd9d2000342a0506b7c8bf4897d (diff) | |
| download | meson-2b3562cc3ad6ac4e98de2c866fbacb009c2fcc69.zip meson-2b3562cc3ad6ac4e98de2c866fbacb009c2fcc69.tar.gz meson-2b3562cc3ad6ac4e98de2c866fbacb009c2fcc69.tar.bz2 | |
Merge pull request #3404 from xclaesse/extract-recursive
extract_all_objects(): Recursively extract objects
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index a4c93de..b119b3d 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -606,8 +606,15 @@ class BuildTargetHolder(TargetHolder): gobjs = self.held_object.extract_objects(args) return GeneratedObjectsHolder(gobjs) + @permittedMethodKwargs({'recursive'}) def extract_all_objects_method(self, args, kwargs): - gobjs = self.held_object.extract_all_objects() + recursive = kwargs.get('recursive', False) + gobjs = self.held_object.extract_all_objects(recursive) + if gobjs.objlist and 'recursive' not in kwargs: + mlog.warning('extract_all_objects called without setting recursive ' + 'keyword argument. Meson currently defaults to ' + 'non-recursive to maintain backward compatibility but ' + 'the default will be changed in the future.') return GeneratedObjectsHolder(gobjs) def get_id_method(self, args, kwargs): |