kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Changed color scheme to be more readable on both white and black backgrounds.

Browse Source
This commit is contained in:
Brad King 2006-04-20 09:59:22 -04:00
parent 4d9634c3e5
commit cceb8e87f1
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -876,7 +876,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
EchoColor color) EchoColor color)
{ {
// Choose the color for the text. // Choose the color for the text.
const char* prefix = 0; std::string prefix;
if(this->GlobalGenerator->GetToolSupportsColorVT100() && if(this->GlobalGenerator->GetToolSupportsColorVT100() &&
this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE")) this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE"))
{ {
@ -885,23 +885,23 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
case EchoNormal: case EchoNormal:
break; break;
case EchoDepend: case EchoDepend:
prefix = CMAKE_VT100_FRONT_MAGENTA CMAKE_VT100_BOLD; prefix = CMAKE_VT100_FRONT_MAGENTA;
break; break;
case EchoBuild: case EchoBuild:
prefix = CMAKE_VT100_FRONT_GREEN CMAKE_VT100_BOLD; prefix = CMAKE_VT100_FRONT_GREEN;
break; break;
case EchoLink: case EchoLink:
prefix = CMAKE_VT100_FRONT_YELLOW CMAKE_VT100_BOLD; prefix = CMAKE_VT100_FRONT_RED;
break; break;
case EchoGenerate: case EchoGenerate:
prefix = CMAKE_VT100_FRONT_BLUE CMAKE_VT100_BOLD; prefix = CMAKE_VT100_FRONT_BLUE;
break; break;
case EchoGlobal: case EchoGlobal:
prefix = CMAKE_VT100_FRONT_CYAN CMAKE_VT100_BOLD; prefix = CMAKE_VT100_FRONT_CYAN;
break; break;
} }
} }
const char* suffix = prefix? CMAKE_VT100_NORMAL : 0; std::string suffix = prefix.empty()? "" : CMAKE_VT100_NORMAL;
// Echo one line at a time. // Echo one line at a time.
std::string line; std::string line;
@ -919,15 +919,9 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
{ {
cmd += "\""; cmd += "\"";
} }
if(prefix) cmd += prefix;
{
cmd += prefix;
}
cmd += line; cmd += line;
if(suffix) cmd += suffix;
{
cmd += suffix;
}
if(this->EchoNeedsQuote) if(this->EchoNeedsQuote)
{ {
cmd += "\""; cmd += "\"";