kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'clang-tidy-output-cleanup' 

04d74a7f Clang-Tidy: copy stdout to sterr; ignore original stderr
This commit is contained in:
Brad King 2016-04-28 09:26:03 -04:00 committed by CMake Topic Stage
parent a2de7f372c 04d74a7f89
commit 3c189bbb33
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmcmd.cxx
View File

@ -389,13 +389,17 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
tidy_cmd.push_back("--");
tidy_cmd.insert(tidy_cmd.end(), orig_cmd.begin()+1, orig_cmd.end());
// Run the tidy command line.
if(!cmSystemTools::RunSingleCommand(tidy_cmd, 0, 0, &ret, 0,
cmSystemTools::OUTPUT_PASSTHROUGH))
// Run the tidy command line. Capture its stdout and hide its stderr.
std::string stdOut;
if(!cmSystemTools::RunSingleCommand(tidy_cmd, &stdOut, 0, &ret, 0,
cmSystemTools::OUTPUT_NONE))
{
std::cerr << "Error running '" << tidy_cmd[0] << "'\n";
return 1;
}
// Output the stdout from clang-tidy to stderr
std::cerr << stdOut;
}
// Now run the real compiler command and return its result value.