diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-28 19:17:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-28 19:17:49 (GMT) |
| commit | f6336f6cfdc0c7cf1e040f0a84ded5c39e504bfd (patch) | |
| tree | 0a0290dad33ee030207e4d73a6131f23e84d2f93 | |
| parent | f4bdda87d62171375e7dad71f2fa8e7e20a4dc2b (diff) | |
| parent | bfb9d34f8afe66c2ce344b36db48568fc88950c9 (diff) | |
| download | CMake-f6336f6cfdc0c7cf1e040f0a84ded5c39e504bfd.zip CMake-f6336f6cfdc0c7cf1e040f0a84ded5c39e504bfd.tar.gz CMake-f6336f6cfdc0c7cf1e040f0a84ded5c39e504bfd.tar.bz2 | |
Merge branch 'makefile-color-when-needed' into release
| -rw-r--r-- | Source/cmSystemTools.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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. |