From 1d443f1bc6ecd1bc793e7af15b69bc70830062db Mon Sep 17 00:00:00 2001
From: Oskar Sigvardsson <oskarsigvardsson@gmail.com>
Date: Sun, 4 Oct 2020 12:57:02 +0200
Subject: Fixed using files object in subdir with xcode backend

Fixes bug #589. When generating string from file object, it didn't take subdir
into account.
---
 mesonbuild/backend/xcodebackend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mesonbuild/backend/xcodebackend.py')

diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 3fe6574..ef0c956 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -264,7 +264,7 @@ class XCodeBackend(backends.Backend):
 
             for s in t.sources:
                 if isinstance(s, mesonlib.File):
-                    s = s.fname
+                    s = os.path.join(s.subdir, s.fname)
 
                 if isinstance(s, str):
                     s = os.path.join(t.subdir, s)
-- 
cgit v1.1