diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-01-20 08:30:07 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-02-24 20:03:28 -0500 |
| commit | 8f683eeb21021f5907e8a6587c59d2d486399027 (patch) | |
| tree | 5981c0f28f5545b44aaf62f93a19f8d9b621a1c2 | |
| parent | f9da31ce612e012e2f830ad7815a8333c670072f (diff) | |
| download | meson-8f683eeb21021f5907e8a6587c59d2d486399027.zip meson-8f683eeb21021f5907e8a6587c59d2d486399027.tar.gz meson-8f683eeb21021f5907e8a6587c59d2d486399027.tar.bz2 | |
mcompile: Do not exclude targets from subprojects
When giving full path to a target there is no reason to skip targets
from subprojects, the path can start with `subprojects/`.
| -rw-r--r-- | mesonbuild/mcompile.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py index 2f5cee9..e14f9e9 100644 --- a/mesonbuild/mcompile.py +++ b/mesonbuild/mcompile.py @@ -108,11 +108,9 @@ def get_target_from_intro_data(target: ParsedTargetName, builddir: Path, introsp found_targets = intro_targets else: for intro_target in intro_targets: - if (intro_target['subproject'] or - (target.type and target.type != intro_target['type'].replace(' ', '_')) or - (target.path - and intro_target['filename'] != 'no_name' - and Path(target.path) != Path(intro_target['filename'][0]).relative_to(resolved_bdir).parent)): + if ((target.type and target.type != intro_target['type'].replace(' ', '_')) or + (target.path and intro_target['filename'] != 'no_name' and + Path(target.path) != Path(intro_target['filename'][0]).relative_to(resolved_bdir).parent)): continue found_targets += [intro_target] |