diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-20 19:36:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-20 19:47:50 (GMT) |
| commit | 356c26ebdfa053f59b2932c78ae81cba3c872dc3 (patch) | |
| tree | 48586b8e866870dc225395280ee8c1123998db65 /Source/cmGlobalGenerator.cxx | |
| parent | f438cd373131b85dd71b1f902c56fb3584cf8f87 (diff) | |
| download | CMake-356c26ebdfa053f59b2932c78ae81cba3c872dc3.zip CMake-356c26ebdfa053f59b2932c78ae81cba3c872dc3.tar.gz CMake-356c26ebdfa053f59b2932c78ae81cba3c872dc3.tar.bz2 | |
cmSystemTools: Teach RunSingleCommand to separate stdout and stderr
Extend the RunSingleCommand signature to capture stdout and stderr
separately. Allow both to be captured to the same std::string
to preserve existing behavior. Update all call sites to do this
so that this refactoring does not introduce functional changes.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4a9f628..4b0ef58 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1737,7 +1737,7 @@ int cmGlobalGenerator::Build( output += cmSystemTools::PrintSingleCommand(cleanCommand); output += "\n"; - if (!cmSystemTools::RunSingleCommand(cleanCommand, outputPtr, + if (!cmSystemTools::RunSingleCommand(cleanCommand, outputPtr, outputPtr, &retVal, 0, outputflag, timeout)) { cmSystemTools::SetRunCommandHideConsole(hideconsole); @@ -1758,7 +1758,7 @@ int cmGlobalGenerator::Build( output += makeCommandStr; output += "\n"; - if (!cmSystemTools::RunSingleCommand(makeCommand, outputPtr, + if (!cmSystemTools::RunSingleCommand(makeCommand, outputPtr, outputPtr, &retVal, 0, outputflag, timeout)) { cmSystemTools::SetRunCommandHideConsole(hideconsole); |