[Cmake-commits] CMake branch, next, updated. v3.3.1-2615-g0ef3eae

[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  0ef3eae3a17803fcf0a4de7bf87f217da134663d (commit)
       via  bfb9d34f8afe66c2ce344b36db48568fc88950c9 (commit)
      from  9bbf90981849096ccabb54f8832756ba7f290a16 (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=0ef3eae3a17803fcf0a4de7bf87f217da134663d
commit 0ef3eae3a17803fcf0a4de7bf87f217da134663d
Merge: 9bbf909 bfb9d34
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 28 15:17:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 28 15:17:07 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bfb9d34f8afe66c2ce344b36db48568fc88950c9
commit bfb9d34f8afe66c2ce344b36db48568fc88950c9
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 15:16:05 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.
    If we capture the vt100 escapes in try_compile output, they contain
    unbalanced square brackets.  This causes CMakeParseImplicitLinkInfo
    to fail to separate lines in a ;-list and therefore fail to extract
    information from the link line.  Then mixed-language linking breaks.

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:


hooks/post-receive
-- 
CMake