Skip to content

Xcode: Don't hard-code SDK-provided implicit framework search paths

Craig Scott requested to merge craig.scott/cmake:xcode-framework-path into master

In !5216 (merged), a regression was introduced which broke device and simulator builds from the same configured project. It hard-coded a framework's path into the linker's framework search path even when that path was already one of the implicit search paths. CMake 3.18.5 discarded such paths, so restore that behavior by not forcing the addition of the framework search path if it is one of the implicit paths or has been added already.

The fix for this uncovered the need for another change, !5638 (merged), that has already been added to master since the offending commit. It has been cherry-picked to this branch as well so that the 3.19 release branch doesn't end up with a new regression as a result of this fix.

Fixes: #21678 (closed)
Backport: release

Edited by Brad King

Merge request reports