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/cmcldeps.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/cmcldeps.cxx')
-rw-r--r-- | Source/cmcldeps.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 55fc633..f3c6059 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -206,8 +206,9 @@ static int process( const std::string& srcfilename, } // run the command int exit_code = 0; - bool run = cmSystemTools::RunSingleCommand(command, &output, &exit_code, - dir.c_str(), cmSystemTools::OUTPUT_NONE); + bool run = cmSystemTools::RunSingleCommand(command, &output, &output, + &exit_code, dir.c_str(), + cmSystemTools::OUTPUT_NONE); // process the include directives and output everything else std::stringstream ss(output); |