diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-14 19:40:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 19:40:34 +0300 |
| commit | 30d78f39812a0585a27e24ab44ef4e9da1f12574 (patch) | |
| tree | 437f8b5d8e63e900f5b41923dcd33fc3950fe4f9 /mesonbuild/msubprojects.py | |
| parent | 8b8a610ea4ed632759b831606723d1cafa8920d7 (diff) | |
| parent | 3a0182378612bc764667328805b11bc92db696c2 (diff) | |
| download | meson-30d78f39812a0585a27e24ab44ef4e9da1f12574.zip meson-30d78f39812a0585a27e24ab44ef4e9da1f12574.tar.gz meson-30d78f39812a0585a27e24ab44ef4e9da1f12574.tar.bz2 | |
Merge pull request #6968 from xclaesse/auto-promote
Merge wraps from subprojects into wraps from main project
Diffstat (limited to 'mesonbuild/msubprojects.py')
| -rwxr-xr-x | mesonbuild/msubprojects.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index b628a47..20639cb 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -364,7 +364,7 @@ def run(options): if not os.path.isdir(subprojects_dir): mlog.log('Directory', mlog.bold(src_dir), 'does not seem to have subprojects.') return 0 - r = Resolver(subprojects_dir) + r = Resolver(src_dir, 'subprojects') if options.subprojects: wraps = [wrap for name, wrap in r.wraps.items() if name in options.subprojects] else: |