From 24bf97440fc8730860620c65d9dfd487ca68c69d Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Oct 2009 14:54:19 -0400 Subject: 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. --- Source/cmake.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d299544..48a0e83 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1493,11 +1493,12 @@ int cmake::ExecuteCMakeCommand(std::vector& args) startOutDir = args[6]; depInfo = args[7]; if(args.size() >= 9 && - args[8].length() > 8 && + args[8].length() >= 8 && args[8].substr(0, 8) == "--color=") { // 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 -- cgit v0.12