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/cmCPackOSXX11Generator.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/cmCPackOSXX11Generator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 313e08b..d533af8 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -180,9 +180,9 @@ int cmCPackOSXX11Generator::PackageFiles() bool res = false; while(numTries > 0) { - res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output, - &retVal, 0, - this->GeneratorVerbose, 0); + res = cmSystemTools::RunSingleCommand( + dmgCmd.str().c_str(), &output, &output, + &retVal, 0, this->GeneratorVerbose, 0); if ( res && !retVal ) { numTries = -1; |