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

Handle same Framework multiple times in Xcode.

This commit is contained in:
Jussi Pakkanen 2022-03-31 18:13:21 +03:00 committed by Eli Schwartz
parent 6f24ab9407
commit a7356f6bf2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/backend/xcodebackend.py
View File

@ -131,8 +131,8 @@ class PbxDict:
self.items = [] self.items = []
def add_item(self, key, value, comment=''): def add_item(self, key, value, comment=''):
item = PbxDictItem(key, value, comment)
assert key not in self.keys assert key not in self.keys
item = PbxDictItem(key, value, comment)
self.keys.add(key) self.keys.add(key)
self.items.append(item) self.items.append(item)
@ -601,7 +601,9 @@ class XCodeBackend(backends.Backend):
if isinstance(dep, dependencies.AppleFrameworks): if isinstance(dep, dependencies.AppleFrameworks):
for f in dep.frameworks: for f in dep.frameworks:
fw_dict = PbxDict() fw_dict = PbxDict()
objects_dict.add_item(self.native_frameworks[f], fw_dict, f'{f}.framework in Frameworks') fwkey = self.native_frameworks[f]
if fwkey not in objects_dict.keys:
objects_dict.add_item(fwkey, fw_dict, f'{f}.framework in Frameworks')
fw_dict.add_item('isa', 'PBXBuildFile') fw_dict.add_item('isa', 'PBXBuildFile')
fw_dict.add_item('fileRef', self.native_frameworks_fileref[f], f) fw_dict.add_item('fileRef', self.native_frameworks_fileref[f], f)