diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-15 13:04:40 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-15 09:04:49 -0400 |
| commit | 2b91a96633cc1ef32abe98b3939417bfb2cd00a7 (patch) | |
| tree | 8b46d6103631c95184ce6bf7968d35368d3e3e1f /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 9b22e036d12fe590b1e7512bbed90ddbc54128eb (diff) | |
| parent | fc06450ff49db8ebf86977b85206c75de4a40ed3 (diff) | |
| download | cmake-2b91a96633cc1ef32abe98b3939417bfb2cd00a7.tar.gz | |
Merge topic 'link-framework-with-multi-config-postfix'
fc06450ff4 Apple: Fix regression when linking a framework with postfix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7675
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index eb85b47e82..6196861cef 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3841,9 +3841,17 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target) // an implicit search path, so we need it libPaths.Add("-F " + this->XCodeEscapePath(fwItems->first)); } - libPaths.Add( - libName.GetFormattedItem(this->XCodeEscapePath(fwItems->second)) - .Value); + if (libName.GetFeatureName() == "__CMAKE_LINK_FRAMEWORK"_s) { + // use the full path + libPaths.Add( + libName.GetFormattedItem(this->XCodeEscapePath(cleanPath)) + .Value); + } else { + libPaths.Add( + libName + .GetFormattedItem(this->XCodeEscapePath(fwItems->second)) + .Value); + } } else { libPaths.Add( libName.GetFormattedItem(this->XCodeEscapePath(cleanPath)) |