aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Moguillansky <jmoguillansky@gopro.com>2021-02-03 16:12:06 -0800
committerJussi Pakkanen <jpakkane@gmail.com>2021-02-04 17:35:20 +0000
commit5d94d161ff0abf72ed7c771ab3bb86e34560762e (patch)
treeb3185eef932e915bb78350341dd6aeee2f54cbe9
parent46e3480f7c675b140ca4496c658069696daa176d (diff)
downloadmeson-5d94d161ff0abf72ed7c771ab3bb86e34560762e.zip
meson-5d94d161ff0abf72ed7c771ab3bb86e34560762e.tar.gz
meson-5d94d161ff0abf72ed7c771ab3bb86e34560762e.tar.bz2
xcode-backend: fix include paths
Add project directory as include path Add include paths from dependencies for all languages (c, c++, objc, objc++)
-rw-r--r--mesonbuild/backend/xcodebackend.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 09a40ef..eb0db1f 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -735,6 +735,7 @@ class XCodeBackend(backends.Backend):
product_name = target.get_basename()
ldargs += target.link_args
cargs = []
+ cargs.append('-I.')
for dep in target.get_external_deps():
cargs += dep.get_compile_args()
ldargs += dep.get_link_args()
@@ -753,7 +754,7 @@ class XCodeBackend(backends.Backend):
args = pargs + gargs + targs
if args:
langargs[langnamemap[lang]] = args
- langargs['C'] += cargs
+ langargs[langnamemap[lang]] += cargs
symroot = os.path.join(self.environment.get_build_dir(), target.subdir)
self.write_line('%s /* %s */ = {' % (valid, buildtype))
self.indent_level += 1