Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Xcode: fix setting up inlude args for source and build dirs.

This commit is contained in:
Jussi Pakkanen 2021-04-10 22:22:02 +03:00
parent be3efaf1d5
commit 9dfd53dc40
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/backend/backends.py
View File

@ -262,9 +262,13 @@ class Backend:
return self.environment.coredata.validate_option_value(option_name, override) return self.environment.coredata.validate_option_value(option_name, override)
return self.environment.coredata.get_option(option_name.evolve(subproject=target.subproject)) return self.environment.coredata.get_option(option_name.evolve(subproject=target.subproject))
def get_source_dir_include_args(self, target, compiler): def get_source_dir_include_args(self, target, compiler, *, absolute_path=False):
curdir = target.get_subdir() curdir = target.get_subdir()
tmppath = os.path.normpath(os.path.join(self.build_to_src, curdir)) if absolute_path:
lead = self.source_dir
else:
lead = self.build_to_src
tmppath = os.path.normpath(os.path.join(lead, curdir))
return compiler.get_include_args(tmppath, False) return compiler.get_include_args(tmppath, False)
def get_build_dir_include_args(self, target, compiler, *, absolute_path=False): def get_build_dir_include_args(self, target, compiler, *, absolute_path=False):

15
mesonbuild/backend/xcodebackend.py
View File

@ -1030,6 +1030,7 @@ class XCodeBackend(backends.Backend):
# add the root build dir to the search path. So add an absolute path instead. # add the root build dir to the search path. So add an absolute path instead.
# This may break reproducible builds, in which case patches are welcome. # This may break reproducible builds, in which case patches are welcome.
lang_cargs += self.get_build_dir_include_args(target, compiler, absolute_path=True) lang_cargs += self.get_build_dir_include_args(target, compiler, absolute_path=True)
lang_cargs += self.get_source_dir_include_args(target, compiler, absolute_path=True)
langargs[langname] = args langargs[langname] = args
langargs[langname] += lang_cargs langargs[langname] += lang_cargs
symroot = os.path.join(self.environment.get_build_dir(), target.subdir) symroot = os.path.join(self.environment.get_build_dir(), target.subdir)
@ -1080,7 +1081,11 @@ class XCodeBackend(backends.Backend):
settings_dict.add_item('PRODUCT_NAME', product_name) settings_dict.add_item('PRODUCT_NAME', product_name)
settings_dict.add_item('SECTORDER_FLAGS', '""') settings_dict.add_item('SECTORDER_FLAGS', '""')
settings_dict.add_item('SYMROOT', f'"{symroot}"') settings_dict.add_item('SYMROOT', f'"{symroot}"')
settings_dict.add_item('SYSTEM_HEADER_SEARCH_PATHS', '"{}"'.format(self.environment.get_build_dir())) sysheader_arr = PbxArray()
# XCode will change every -I flag that points inside these directories
# to an -isystem. Thus set nothing in it since we control our own
# include flags.
settings_dict.add_item('SYSTEM_HEADER_SEARCH_PATHS', sysheader_arr)
settings_dict.add_item('USE_HEADERMAP', 'NO') settings_dict.add_item('USE_HEADERMAP', 'NO')
warn_array = PbxArray() warn_array = PbxArray()
settings_dict.add_item('WARNING_CFLAGS', warn_array) settings_dict.add_item('WARNING_CFLAGS', warn_array)
@ -1090,8 +1095,12 @@ class XCodeBackend(backends.Backend):
def add_otherargs(self, settings_dict, langargs): def add_otherargs(self, settings_dict, langargs):
for langname, args in langargs.items(): for langname, args in langargs.items():
if args: if args:
# FIXME, proper quoting quoted_args = []
settings_dict.add_item(f'OTHER_{langname}FLAGS', '"' + ' '.join(args) + '"') for a in args:
if ' ' in a:
a = r'\"' + a + r'\"'
quoted_args.append(a)
settings_dict.add_item(f'OTHER_{langname}FLAGS', '"' + ' '.join(quoted_args) + '"')
def generate_xc_configurationList(self, objects_dict): def generate_xc_configurationList(self, objects_dict):
# FIXME: sort items # FIXME: sort items