[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3114-ga9b5692

[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  a9b5692aa858acff5e9b12ab58a0c1c612ca1c6f (commit)
       via  2ea0d613b5428154c6fe446e4e2cde1b3983827a (commit)
      from  7ab0e8bcac3c0a1c522be9e45bd15d82444a6895 (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=a9b5692aa858acff5e9b12ab58a0c1c612ca1c6f
commit a9b5692aa858acff5e9b12ab58a0c1c612ca1c6f
Merge: 7ab0e8b 2ea0d61
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 09:37:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 15 09:37:48 2013 -0400

    Merge topic 'vs-no-indirect-output' into next
    
    2ea0d61 bootstrap: Skip VS_UNICODE_OUTPUT handling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ea0d613b5428154c6fe446e4e2cde1b3983827a
commit 2ea0d613b5428154c6fe446e4e2cde1b3983827a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 09:36:43 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 15 09:36:49 2013 -0400

    bootstrap: Skip VS_UNICODE_OUTPUT handling
    
    We do not need this during MSys bootstrap anyway.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 52d0a74..c52c266 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1706,11 +1706,13 @@ void cmSystemTools::EnableVSConsoleOutput()
   // output and allow it to be captured on the fly.
   cmSystemTools::PutEnv("vsconsoleoutput=1");
 
+# ifdef CMAKE_BUILD_WITH_CMAKE
   // VS sets an environment variable to tell MS tools like "cl" to report
   // output through a backdoor pipe instead of stdout/stderr.  Unset the
   // environment variable to close this backdoor for any path of process
   // invocations that passes through CMake so we can capture the output.
   cmSystemTools::UnsetEnv("VS_UNICODE_OUTPUT");
+# endif
 #endif
 }
 

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

Summary of changes:
 Source/cmSystemTools.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake