[Cmake-commits] CMake branch, next, updated. v3.2.0-942-g1191533

[Brad King]

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, next has been updated
       via  11915337b3e9e3964e5a98155d5399e76fe30803 (commit)
       via  94887cb6f1200c505d86e3e52f7abf88cb5e2a72 (commit)
      from  8a48986c38539150ac5eeafa11fb584de68e1d85 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11915337b3e9e3964e5a98155d5399e76fe30803
commit 11915337b3e9e3964e5a98155d5399e76fe30803
Merge: 8a48986 94887cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 08:47:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 10 08:47:03 2015 -0400

    Merge topic 'vs-express-build-output' into next
    
    94887cb6 cmake: Teach --build to get VCExpress output (#15437)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94887cb6f1200c505d86e3e52f7abf88cb5e2a72
commit 94887cb6f1200c505d86e3e52f7abf88cb5e2a72
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 08:42:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 10 08:42:18 2015 -0400

    cmake: Teach --build to get VCExpress output (#15437)
    
    VCExpress does not produce output if its pipes are connected to
    an interactive terminal.  Add a special case to 'cmake --build'
    to capture the output through a pipe and re-print it instead of
    sharing output pipes with VCExpress.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 36395aa..e95cf50 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1717,6 +1717,19 @@ int cmGlobalGenerator::Build(
   std::string outputBuffer;
   std::string* outputPtr = &outputBuffer;
 
+  std::vector<std::string> makeCommand;
+  this->GenerateBuildCommand(makeCommand, makeCommandCSTR, projectName,
+                             bindir, target, config, fast, verbose,
+                             nativeOptions);
+
+  // Workaround to convince VCExpress.exe to produce output.
+  if (outputflag == cmSystemTools::OUTPUT_PASSTHROUGH &&
+      !makeCommand.empty() && cmSystemTools::LowerCase(
+        cmSystemTools::GetFilenameName(makeCommand[0])) == "vcexpress.exe")
+    {
+    outputflag = cmSystemTools::OUTPUT_NORMAL;
+    }
+
   // should we do a clean first?
   if (clean)
     {
@@ -1743,10 +1756,6 @@ int cmGlobalGenerator::Build(
     }
 
   // now build
-  std::vector<std::string> makeCommand;
-  this->GenerateBuildCommand(makeCommand, makeCommandCSTR, projectName,
-                             bindir, target, config, fast, verbose,
-                             nativeOptions);
   std::string makeCommandStr = cmSystemTools::PrintSingleCommand(makeCommand);
   output += "\nRun Build Command:";
   output += makeCommandStr;

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake