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

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
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.


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.432
retrieving revision 1.433
diff -C 2 -d -r1.432 -r1.433
*** cmake.cxx	8 Oct 2009 18:45:25 -0000	1.432
--- cmake.cxx	8 Oct 2009 18:54:19 -0000	1.433
***************
*** 1494,1502 ****
          depInfo = args[7];
          if(args.size() >= 9 &&
!            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());
            }
          }
--- 1494,1503 ----
          depInfo = args[7];
          if(args.size() >= 9 &&
!            args[8].length() >= 8 &&
             args[8].substr(0, 8) == "--color=")
            {
            // Enable or disable color based on the switch value.
!           color = (args[8].size() == 8 ||
!                    cmSystemTools::IsOn(args[8].substr(8).c_str()));
            }
          }