diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-05 23:39:07 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-17 21:19:22 +0200 |
| commit | 164fb9a150d2a210aee7fa66d0e06ed475c4bdd8 (patch) | |
| tree | 8af07ed64e5a77e0fbba084b5b1a0a4577bbddb1 /mesonbuild/mesonlib.py | |
| parent | 5b9d79b9029f1a9be897188c6ffbdce65d4e510b (diff) | |
| download | meson-164fb9a150d2a210aee7fa66d0e06ed475c4bdd8.zip meson-164fb9a150d2a210aee7fa66d0e06ed475c4bdd8.tar.gz meson-164fb9a150d2a210aee7fa66d0e06ed475c4bdd8.tar.bz2 | |
Also promote wrap files.
Diffstat (limited to 'mesonbuild/mesonlib.py')
| -rw-r--r-- | mesonbuild/mesonlib.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 8da08d3..bc66b5c 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -901,13 +901,18 @@ def detect_subprojects(spdir_name, current_dir='', result=None): basename = os.path.split(trial)[1] if trial == 'packagecache': continue - if not os.path.isdir(trial): - continue - if basename in result: - result[basename].append(trial) + append_this = True + if os.path.isdir(trial): + detect_subprojects(spdir_name, trial, result) + elif trial.endswith('.wrap') and os.path.isfile(trial): + basename = os.path.splitext(basename)[0] else: - result[basename] = [trial] - detect_subprojects(spdir_name, trial, result) + append_this = False + if append_this: + if basename in result: + result[basename].append(trial) + else: + result[basename] = [trial] return result class OrderedSet(collections.MutableSet): |