Skip to content

Commit 60c3c14

Browse files
klokikeli-schwartz
authored andcommitted
Xcode backend: only use found appleframeworksn
Add a check before using an `appleframeworks` to make sure it was found. This fixes an exception in meson while encountering an optional dep for the target. (cherry picked from commit 273894d)
1 parent 68b11bb commit 60c3c14

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

mesonbuild/backend/xcodebackend.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ def generate_native_frameworks_map(self) -> None:
526526
self.native_frameworks_fileref = {}
527527
for t in self.build_targets.values():
528528
for dep in t.get_external_deps():
529-
if dep.name == 'appleframeworks':
529+
if dep.name == 'appleframeworks' and dep.found():
530530
for f in dep.frameworks:
531531
self.native_frameworks[f] = self.gen_id()
532532
self.native_frameworks_fileref[f] = self.gen_id()
@@ -691,7 +691,7 @@ def generate_pbx_aggregate_target(self, objects_dict: PbxDict) -> None:
691691
def generate_pbx_build_file(self, objects_dict: PbxDict) -> None:
692692
for tname, t in self.build_targets.items():
693693
for dep in t.get_external_deps():
694-
if dep.name == 'appleframeworks':
694+
if dep.name == 'appleframeworks' and dep.found():
695695
for f in dep.frameworks:
696696
fw_dict = PbxDict()
697697
fwkey = self.native_frameworks[f]
@@ -848,7 +848,7 @@ def generate_pbx_container_item_proxy(self, objects_dict: PbxDict) -> None:
848848
def generate_pbx_file_reference(self, objects_dict: PbxDict) -> None:
849849
for tname, t in self.build_targets.items():
850850
for dep in t.get_external_deps():
851-
if dep.name == 'appleframeworks':
851+
if dep.name == 'appleframeworks' and dep.found():
852852
for f in dep.frameworks:
853853
fw_dict = PbxDict()
854854
framework_fileref = self.native_frameworks_fileref[f]
@@ -1023,7 +1023,7 @@ def generate_pbx_frameworks_buildphase(self, objects_dict: PbxDict) -> None:
10231023
file_list = PbxArray()
10241024
bt_dict.add_item('files', file_list)
10251025
for dep in t.get_external_deps():
1026-
if dep.name == 'appleframeworks':
1026+
if dep.name == 'appleframeworks' and dep.found():
10271027
for f in dep.frameworks:
10281028
file_list.add_item(self.native_frameworks[f], f'{f}.framework in Frameworks')
10291029
bt_dict.add_item('runOnlyForDeploymentPostprocessing', 0)
@@ -1071,7 +1071,7 @@ def generate_pbx_group(self, objects_dict: PbxDict) -> None:
10711071

10721072
for t in self.build_targets.values():
10731073
for dep in t.get_external_deps():
1074-
if dep.name == 'appleframeworks':
1074+
if dep.name == 'appleframeworks' and dep.found():
10751075
for f in dep.frameworks:
10761076
frameworks_children.add_item(self.native_frameworks_fileref[f], f)
10771077

0 commit comments

Comments
 (0)