dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-07-01 20:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Factor out link flag parsing

Browse Source 
Prepare for future reuse of CMP0181's NEW behavior (parsing, `LINKER:`
prefix handling, escaping).
This commit is contained in:
Tyler Yankee
2026-01-16 08:56:44 -05:00
parent 82913923cd
commit 399288871e
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmLocalGenerator.cxx
View File

@@ -2568,6 +2568,25 @@ void cmLocalGenerator::AppendFlagEscape(std::string& flags,
this->EscapeForShell(rawFlag, false, false, false, this->IsNinjaMulti()));
}
void cmLocalGenerator::AppendLinkFlagsWithParsing(
std::string& flags, std::string const& newFlags,
cmGeneratorTarget const* target, std::string const& language)
{
std::vector<std::string> options;
cmSystemTools::ParseUnixCommandLine(newFlags.c_str(), options);
this->SetLinkScriptShell(this->GlobalGenerator->GetUseLinkScript());
std::vector<BT<std::string>> optionsWithBT{ options.size() };
std::transform(options.cbegin(), options.cend(), optionsWithBT.begin(),
[](std::string const& item) -> BT<std::string> {
return BT<std::string>{ item };
});
target->ResolveLinkerWrapper(optionsWithBT, language);
for (auto const& item : optionsWithBT) {
this->AppendFlagEscape(flags, item.Value);
}
this->SetLinkScriptShell(false);
}
void cmLocalGenerator::AppendFlags(std::string& flags,
std::string const& newFlags,
std::string const& name,
@@ -2596,19 +2615,7 @@ void cmLocalGenerator::AppendFlags(std::string& flags,
break;
case cmPolicies::NEW:
if (compileOrLink == cmBuildStep::Link) {
std::vector<std::string> options;
cmSystemTools::ParseUnixCommandLine(newFlags.c_str(), options);
this->SetLinkScriptShell(this->GlobalGenerator->GetUseLinkScript());
std::vector<BT<std::string>> optionsWithBT{ options.size() };
std::transform(options.cbegin(), options.cend(), optionsWithBT.begin(),
[](std::string const& item) -> BT<std::string> {
return BT<std::string>{ item };
});
target->ResolveLinkerWrapper(optionsWithBT, language);
for (auto const& item : optionsWithBT) {
this->AppendFlagEscape(flags, item.Value);
}
this->SetLinkScriptShell(false);
this->AppendLinkFlagsWithParsing(flags, newFlags, target, language);
} else {
this->AppendFlags(flags, newFlags);
}

4
Source/cmLocalGenerator.h
View File

@@ -170,6 +170,10 @@ public:
* Append flags after parsing, prefixes processing (like LINKER:) and
* escaping
*/
void AppendLinkFlagsWithParsing(std::string& flags,
std::string const& newFlags,
cmGeneratorTarget const* target,
std::string const& lang);
void AppendFlags(std::string& flags, std::string const& newFlags,
std::string const& name, cmGeneratorTarget const* target,
cmBuildStep compileOrLink, std::string const& lang);