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

REALLY fix color check for dependency scanning 

The commit "Really fix color check for dependency scanning" disabled
color unless "make COLOR=ON" is specified.  This restores the previous
default behavior when CMAKE_COLOR_MAKEFILE is ON while retaining the
previous commit's fix.  See issue #9680.
This commit is contained in:
Brad King 2009-10-08 14:54:19 -04:00
parent dfa3b4f145
commit 24bf97440f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmake.cxx
View File

@ -1493,11 +1493,12 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
startOutDir = args[6]; startOutDir = args[6];
depInfo = args[7]; depInfo = args[7];
if(args.size() >= 9 && if(args.size() >= 9 &&
args[8].length() > 8 && args[8].length() >= 8 &&
args[8].substr(0, 8) == "--color=") args[8].substr(0, 8) == "--color=")
{ {
// Enable or disable color based on the switch value. // Enable or disable color based on the switch value.
color = cmSystemTools::IsOn(args[8].substr(8).c_str()); color = (args[8].size() == 8 ||
cmSystemTools::IsOn(args[8].substr(8).c_str()));
} }
} }
else else