aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-04-07 18:09:58 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-04-08 10:22:57 +0300
commit59306c45c525023cfab20a2f6466d812b008c473 (patch)
treea9fbdca2b89c5a55b299e1d682ac87a7d22f37eb
parente759c8b2e9866fb4f244d4233583a8976f3ac162 (diff)
downloadmeson-59306c45c525023cfab20a2f6466d812b008c473.zip
meson-59306c45c525023cfab20a2f6466d812b008c473.tar.gz
meson-59306c45c525023cfab20a2f6466d812b008c473.tar.bz2
Fix Xcode targets in subdirs.
-rw-r--r--mesonbuild/backend/xcodebackend.py4
-rw-r--r--test cases/common/11 subdir/subdir/meson.build3
2 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index c49f01d..b37ee2f 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -431,10 +431,8 @@ class XCodeBackend(backends.Backend):
for s in t.sources:
if isinstance(s, mesonlib.File):
s = os.path.join(s.subdir, s.fname)
-
if not isinstance(s, str):
continue
- s = os.path.join(t.subdir, s)
sdict = PbxDict()
idval = self.buildfile_ids[(tname, s)]
fileref = self.fileref_ids[(tname, s)]
@@ -495,10 +493,8 @@ class XCodeBackend(backends.Backend):
for s in t.sources:
if isinstance(s, mesonlib.File):
s = os.path.join(s.subdir, s.fname)
-
if not isinstance(s, str):
continue
- s = os.path.join(t.subdir, s)
idval = self.fileref_ids[(tname, s)]
fullpath = os.path.join(self.environment.get_source_dir(), s)
src_dict = PbxDict()
diff --git a/test cases/common/11 subdir/subdir/meson.build b/test cases/common/11 subdir/subdir/meson.build
index 5b399f0..d84ec13 100644
--- a/test cases/common/11 subdir/subdir/meson.build
+++ b/test cases/common/11 subdir/subdir/meson.build
@@ -1 +1,2 @@
-executable('prog', 'prog.c')
+prog = executable('prog', 'prog.c')
+test('subdirprog', prog)