[Cmake-commits] CMake branch, next, updated. v3.3.1-2595-g7507ca2

[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  7507ca2302b7c34bf08c83cfe2c7cc1f6be0a57e (commit)
       via  371fe92e82ecadede532a211c1ec36f7039268d7 (commit)
      from  b19023dd1d340cb6677beeec37e67746417e7569 (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=7507ca2302b7c34bf08c83cfe2c7cc1f6be0a57e
commit 7507ca2302b7c34bf08c83cfe2c7cc1f6be0a57e
Merge: b19023d 371fe92
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 28 11:03:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 28 11:03:25 2015 -0400

    Merge topic 'makefile-color-when-needed' into next
    
    371fe92e Makefile: Print color escapes only when necessary


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=371fe92e82ecadede532a211c1ec36f7039268d7
commit 371fe92e82ecadede532a211c1ec36f7039268d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 27 16:41:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 28 10:27:42 2015 -0400

    Makefile: Print color escapes only when necessary
    
    Teach cmSystemTools::MakefileColorEcho to use the color printing API
    only when we actually have a color to print.  This avoids printing
    escape sequences that do not change the text attributes.
    
    Since commit v3.3.0-rc1~480^2~4 (Makefile: Fix output during parallel
    builds, 2015-02-05) we always use this code path to print progress and
    rule messages even when color is disabled (e.g. in a try_compile).  It
    is important to avoid printing escapes when there is no color because on
    MSYS we have no isatty and so assume that vt100 escapes are supported,
    but we do not want to print them when capturing try_compile output.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index e2adabe..b440a17 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2331,7 +2331,7 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message,
     assumeTTY = 0;
     }
 
-  if(enabled)
+  if(enabled && color != cmsysTerminal_Color_Normal)
     {
     // Print with color.  Delay the newline until later so that
     // all color restore sequences appear before it.

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

Summary of changes:
 Source/cmSystemTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake