diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-08-07 13:17:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-07 13:17:26 (GMT) |
| commit | d7a52f8c24a29ff7f64b00566b646f2d125d4ac0 (patch) | |
| tree | 4941e6c6dbc8406ac48d42e96eb3a7d8b76e5793 /Source/CPack | |
| parent | 8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c (diff) | |
| parent | 496d22b8cc5b503537841892c0a630b264de146b (diff) | |
| download | CMake-d7a52f8c24a29ff7f64b00566b646f2d125d4ac0.zip CMake-d7a52f8c24a29ff7f64b00566b646f2d125d4ac0.tar.gz CMake-d7a52f8c24a29ff7f64b00566b646f2d125d4ac0.tar.bz2 | |
Merge topic 'productbuild-merge-output'
496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2257
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackProductBuildGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx index 4ca0fa8..76b3275 100644 --- a/Source/CPack/cmCPackProductBuildGenerator.cxx +++ b/Source/CPack/cmCPackProductBuildGenerator.cxx @@ -144,10 +144,10 @@ bool cmCPackProductBuildGenerator::RunProductBuild(const std::string& command) tmpFile += "/ProductBuildOutput.log"; cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << command << std::endl); - std::string output, error_output; + std::string output; int retVal = 1; bool res = cmSystemTools::RunSingleCommand( - command.c_str(), &output, &error_output, &retVal, nullptr, + command.c_str(), &output, &output, &retVal, nullptr, this->GeneratorVerbose, cmDuration::zero()); cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Done running command" << std::endl); if (!res || retVal) { |