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/cmQtAutoGenerators.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/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 3d5103f..329f9de 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -188,7 +188,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, std::string output; int retVal = 0; - bool result = cmSystemTools::RunSingleCommand(command, &output, + bool result = cmSystemTools::RunSingleCommand(command, &output, &output, &retVal, 0, cmSystemTools::OUTPUT_NONE); if (!result || retVal) @@ -2196,7 +2196,8 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile, std::string output; int retVal = 0; - bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal); + bool result = cmSystemTools::RunSingleCommand(command, &output, &output, + &retVal); if (!result || retVal) { std::cerr << "AUTOGEN: error: process for " << mocFilePath <<" failed:\n" @@ -2265,7 +2266,8 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName, } std::string output; int retVal = 0; - bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal); + bool result = cmSystemTools::RunSingleCommand(command, &output, &output, + &retVal); if (!result || retVal) { std::cerr << "AUTOUIC: error: process for " << ui_output_file << @@ -2355,7 +2357,8 @@ bool cmQtAutoGenerators::GenerateQrc() } std::string output; int retVal = 0; - bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal); + bool result = cmSystemTools::RunSingleCommand(command, &output, &output, + &retVal); if (!result || retVal) { std::cerr << "AUTORCC: error: process for " << rcc_output_file << |