[Cmake-commits] [cmake-commits] king committed cmake.cxx 1.431 1.432

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv26823/Source

Modified Files:
	cmake.cxx 
Log Message:
Really fix color check for dependency scanning

The commit "Fix color check for dependency scanning" was meant to
disable color if CMAKE_COLOR_MAKEFILE was off.  It did remove use of the
activation option '--color' but it failed to make the default false when
the option was missing.  This commit corrects that.  See issue #9680.


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.431
retrieving revision 1.432
diff -C 2 -d -r1.431 -r1.432
*** cmake.cxx	1 Oct 2009 20:47:08 -0000	1.431
--- cmake.cxx	8 Oct 2009 18:45:25 -0000	1.432
***************
*** 1476,1480 ****
        std::string startOutDir;
        std::string depInfo;
!       bool color = true;
        if(args.size() >= 8)
          {
--- 1476,1480 ----
        std::string startOutDir;
        std::string depInfo;
!       bool color = false;
        if(args.size() >= 8)
          {