Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 04:24:36 +08:00
Code Issues Projects Releases Wiki Activity

Ninja: Wrap rules using '>' shell redirection with 'cmd /C' on Windows

Browse Source 
This is needed for the clang-scan-deps rule added by commit 0e21e55fc5
(Clang: Record Clang 16.0 C++ modules flags only for GNU-like front-end,
2023-03-16).

Fixes: #24611
This commit is contained in:
Brad King
2023-03-16 17:16:39 -04:00
parent ffd8537acf
commit 1b7c26da49
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmLocalNinjaGenerator.cxx
View File

@@ -456,6 +456,22 @@ std::string cmLocalNinjaGenerator::WriteCommandScript(
return scriptPath;
}
#ifdef _WIN32
namespace {
bool RuleNeedsCMD(std::string const& cmd)
{
std::vector<std::string> args;
cmSystemTools::ParseWindowsCommandLine(cmd.c_str(), args);
auto it = std::find_if(args.cbegin(), args.cend(),
[](std::string const& arg) -> bool {
// FIXME: Detect more windows shell operators.
return cmHasLiteralPrefix(arg, ">");
});
return it != args.cend();
}
}
#endif
std::string cmLocalNinjaGenerator::BuildCommandLine(
std::vector<std::string> const& cmdLines, std::string const& outputConfig,
std::string const& commandConfig, std::string const& customStep,
@@ -499,7 +515,8 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
std::ostringstream cmd;
#ifdef _WIN32
bool const needCMD = cmdLines.size() > 1;
bool const needCMD =
cmdLines.size() > 1 || (customStep.empty() && RuleNeedsCMD(cmdLines[0]));
for (auto li = cmdLines.begin(); li != cmdLines.end(); ++li) {
if (li != cmdLines.begin()) {
cmd << " && ";