summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-31 13:48:42 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-31 13:48:42 (GMT)
commit51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455 (patch)
tree0d3087691cfc0ce94ca23c21fb43c5d83d177b7c
parent08ae6ced4d5bbdb536a79e561eed54b28ae56836 (diff)
parentbfb9d34f8afe66c2ce344b36db48568fc88950c9 (diff)
downloadCMake-51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455.zip
CMake-51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455.tar.gz
CMake-51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455.tar.bz2
Merge topic 'makefile-color-when-needed'
bfb9d34f Makefile: Print color escapes only when necessary
-rw-r--r--Source/cmSystemTools.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0bf97fc..f711016 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2402,7 +2402,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.