diff options
| author | Jeff Moguillansky <jmoguillansky@gopro.com> | 2021-02-04 10:07:12 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-02-04 13:05:17 -0800 |
| commit | 9226a92fe0111bf84bdad0964e0381c31e5a2379 (patch) | |
| tree | 1d56255a86ffa6eeb3ae34de844253abdd7841f7 /mesonbuild/backend/xcodebackend.py | |
| parent | 7fd69cb4c4452b0dcaad7c2bb96f1e69188865e8 (diff) | |
| download | meson-9226a92fe0111bf84bdad0964e0381c31e5a2379.zip meson-9226a92fe0111bf84bdad0964e0381c31e5a2379.tar.gz meson-9226a92fe0111bf84bdad0964e0381c31e5a2379.tar.bz2 | |
xcode-backend: add implicit includes
Move helper functions get_source_dir_include_args and
get_build_dir_include_args to backend base class
Diffstat (limited to 'mesonbuild/backend/xcodebackend.py')
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 9deffba..7ee4e80 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -738,7 +738,6 @@ class XCodeBackend(backends.Backend): ldargs += self.build.get_project_link_args(linker, target.subproject, target.for_machine) ldargs += self.build.get_global_link_args(linker, target.for_machine) cargs = [] - cargs.append('-I.') for dep in target.get_external_deps(): cargs += dep.get_compile_args() ldargs += dep.get_link_args() @@ -756,8 +755,13 @@ class XCodeBackend(backends.Backend): targs = target.get_extra_args(lang) args = pargs + gargs + targs if args: - langargs[langnamemap[lang]] = args - langargs[langnamemap[lang]] += cargs + langname = langnamemap[lang] + compiler = target.compilers.get(lang) + lang_cargs = cargs + if compiler and target.implicit_include_directories: + lang_cargs += self.get_build_dir_include_args(target, compiler) + langargs[langname] = args + langargs[langname] += lang_cargs symroot = os.path.join(self.environment.get_build_dir(), target.subdir) self.write_line('%s /* %s */ = {' % (valid, buildtype)) self.indent_level += 1 |