diff options
| author | Craig Scott <craig.scott@crascit.com> | 2021-02-03 12:03:00 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2021-02-03 12:11:21 (GMT) |
| commit | 5389bb4274f80b69e45aceffbdf3ffdb1e79908f (patch) | |
| tree | 36aa0599b6baf9cd28cca21e55f17e2dc94b25d7 /Source/cmComputeLinkInformation.cxx | |
| parent | df08f8df3027db25eb1cb75fb6017c3a8c046674 (diff) | |
| download | CMake-5389bb4274f80b69e45aceffbdf3ffdb1e79908f.zip CMake-5389bb4274f80b69e45aceffbdf3ffdb1e79908f.tar.gz CMake-5389bb4274f80b69e45aceffbdf3ffdb1e79908f.tar.bz2 | |
Xcode: Don't hard-code SDK-provided implicit framework search paths
When a framework is linked to a target by its full path and that
framework is located in one of the implicit framework search directories,
CMake 3.18.5 and earlier discarded that path.
ce2dee9e5ba (Xcode: Don't add framework as -framework argument in
linker info list, 2020-09-28) introduced a regression which resulted in
the framework path always being added to the search path even if it
matched one of the implicit search paths. This broke the ability to do
device and simulator builds from the same configured project.
Fixes: #21678
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index d1680ad..b9f15b7 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -474,6 +474,12 @@ std::vector<std::string> const& cmComputeLinkInformation::GetFrameworkPaths() return this->FrameworkPaths; } +std::set<std::string> const& +cmComputeLinkInformation::GetFrameworkPathsEmitted() const +{ + return this->FrameworkPathsEmitted; +} + const std::set<const cmGeneratorTarget*>& cmComputeLinkInformation::GetSharedLibrariesLinked() const { |