cmGlobalGenerator: use a stream for output in `Build`

This allows output to show up in output immediately instead of being
batched.

1 files changed, 6 insertions, 9 deletions

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 868728f..12b9b24 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3625,7 +3625,6 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets,
       return 1;
     }
   }
-  std::string output;
   std::string projName;
   cmValue cachedProjectName =
     this->State->GetCacheEntryValue("CMAKE_PROJECT_NAME");
@@ -3699,18 +3698,16 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets,
   }
 
   this->GlobalGenerator->PrintBuildCommandAdvice(std::cerr, jobs);
+  std::stringstream ostr;
+  // `cmGlobalGenerator::Build` logs metadata about what directory and commands
+  // are being executed to the `output` parameter. If CMake is verbose, print
+  // this out.
+  std::ostream& verbose_ostr = verbose ? std::cout : ostr;
   int buildresult = this->GlobalGenerator->Build(
-    jobs, "", dir, projName, targets, output, "", config, buildOptions,
+    jobs, "", dir, projName, targets, verbose_ostr, "", config, buildOptions,
     verbose, cmDuration::zero(), cmSystemTools::OUTPUT_PASSTHROUGH,
     nativeOptions);
 
-  if (verbose) {
-    // `cmGlobalGenerator::Build` logs metadata about what directory and
-    // commands are being executed to the `output` parameter. If CMake is
-    // verbose, print this out.
-    std::cout << output;
-  }
-
   return buildresult;
 }