Merge branch 'makefile-color-when-needed' into release

This commit is contained in:
Brad King 2015-08-28 15:17:49 -04:00
commit f6336f6cfd
1 changed files with 1 additions and 1 deletions

View File

@ -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.