Merge branch 'cuda_device_link_handle_frameworks' into release-3.14
Merge-request: !3039
diff --git a/Source/cmLinkLineDeviceComputer.cxx b/Source/cmLinkLineDeviceComputer.cxx
index a403dc9..211d03b 100644
--- a/Source/cmLinkLineDeviceComputer.cxx
+++ b/Source/cmLinkLineDeviceComputer.cxx
@@ -34,6 +34,7 @@
// * '-lpthread' => pass-along
// * '-pthread' => drop
// * '-a' => drop
+ // * '-framework Name' (as one string) => drop
return (!cmHasLiteralPrefix(item, "-") || //
cmHasLiteralPrefix(item, "-l") || //
cmHasLiteralPrefix(item, "-L") || //
@@ -54,7 +55,13 @@
typedef cmComputeLinkInformation::ItemVector ItemVector;
ItemVector const& items = cli.GetItems();
std::string config = cli.GetConfig();
+ bool skipItemAfterFramework = false;
for (auto const& item : items) {
+ if (skipItemAfterFramework) {
+ skipItemAfterFramework = false;
+ continue;
+ }
+
if (item.Target) {
bool skip = false;
switch (item.Target->GetType()) {
@@ -84,6 +91,11 @@
out += this->ConvertToOutputFormat(
this->ConvertToLinkReference(item.Value));
}
+ } else if (item.Value == "-framework") {
+ // This is the first part of '-framework Name' where the framework
+ // name is specified as a following item. Ignore both.
+ skipItemAfterFramework = true;
+ continue;
} else if (cmLinkItemValidForDevice(item.Value)) {
out += item.Value;
}
