diff options
| author | Muhammad Ismail Soboute <misoboute@gmail.com> | 2018-08-02 01:26:49 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@constrainttec.com> | 2018-08-06 11:27:51 (GMT) |
| commit | 496d22b8cc5b503537841892c0a630b264de146b (patch) | |
| tree | 79d0ff0710da1e64056ae88be9b6a6cb3c226efd /Source/CPack/cmCPackProductBuildGenerator.cxx | |
| parent | f0e82ce9a2f50e7ce0b9b95dcf32e47ce9a08369 (diff) | |
| download | CMake-496d22b8cc5b503537841892c0a630b264de146b.zip CMake-496d22b8cc5b503537841892c0a630b264de146b.tar.gz CMake-496d22b8cc5b503537841892c0a630b264de146b.tar.bz2 | |
productbuild: Capture stderr too in CPackProductBuild logs
Stdout and stderr will be merged.
Fixes: #18234
Diffstat (limited to 'Source/CPack/cmCPackProductBuildGenerator.cxx')
| -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) { |