[Cmake-commits] CMake branch, master, updated. v3.12.0-385-gd7a52f8

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d7a52f8c24a29ff7f64b00566b646f2d125d4ac0 (commit)
       via  496d22b8cc5b503537841892c0a630b264de146b (commit)
      from  8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7a52f8c24a29ff7f64b00566b646f2d125d4ac0
commit d7a52f8c24a29ff7f64b00566b646f2d125d4ac0
Merge: 8f0b3d2 496d22b
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue Aug 7 13:17:15 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Aug 7 09:17:26 2018 -0400

    Merge topic 'productbuild-merge-output'
    
    496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2257


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=496d22b8cc5b503537841892c0a630b264de146b
commit 496d22b8cc5b503537841892c0a630b264de146b
Author:     Muhammad Ismail Soboute <misoboute at gmail.com>
AuthorDate: Thu Aug 2 05:56:49 2018 +0430
Commit:     Craig Scott <craig.scott at constrainttec.com>
CommitDate: Mon Aug 6 21:27:51 2018 +1000

    productbuild: Capture stderr too in CPackProductBuild logs
    
    Stdout and stderr will be merged.
    
    Fixes: #18234

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) {

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackProductBuildGenerator.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake