Просмотр исходного кода

Merge topic 'productbuild-merge-output'

496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2257
Craig Scott 7 лет назад
Родитель
Сommit
d7a52f8c24
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      Source/CPack/cmCPackProductBuildGenerator.cxx

+ 2 - 2
Source/CPack/cmCPackProductBuildGenerator.cxx

@@ -144,10 +144,10 @@ bool cmCPackProductBuildGenerator::RunProductBuild(const std::string& command)
   tmpFile += "/ProductBuildOutput.log";
   tmpFile += "/ProductBuildOutput.log";
 
 
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << command << std::endl);
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << command << std::endl);
-  std::string output, error_output;
+  std::string output;
   int retVal = 1;
   int retVal = 1;
   bool res = cmSystemTools::RunSingleCommand(
   bool res = cmSystemTools::RunSingleCommand(
-    command.c_str(), &output, &error_output, &retVal, nullptr,
+    command.c_str(), &output, &output, &retVal, nullptr,
     this->GeneratorVerbose, cmDuration::zero());
     this->GeneratorVerbose, cmDuration::zero());
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Done running command" << std::endl);
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Done running command" << std::endl);
   if (!res || retVal) {
   if (!res || retVal) {