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/CPack/cmCPackDebGenerator.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/CPack/cmCPackDebGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index fcf4122..fa02a3b 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -466,7 +466,7 @@ int cmCPackDebGenerator::createDeb() std::string output; int retval = -1; - int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, + int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, &output, &retval, this->GetOption("WDIR"), this->GeneratorVerbose, 0); if ( !res || retval ) @@ -505,7 +505,7 @@ int cmCPackDebGenerator::createDeb() cmd += "\""; //std::string output; //int retVal = -1; - res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, + res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, &output, &retval, toplevel.c_str(), this->GeneratorVerbose, 0); if ( !res || retval ) { @@ -553,7 +553,7 @@ int cmCPackDebGenerator::createDeb() } } } - res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, + res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, &output, &retval, this->GetOption("WDIR"), this->GeneratorVerbose, 0); if ( !res || retval ) |