[Cmake-commits] [cmake-commits] king committed cmLocalUnixMakefileGenerator3.h 1.83 1.84 cmMakefileTargetGenerator.cxx 1.108 1.109

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalUnixMakefileGenerator3.h cmMakefileTargetGenerator.cxx 
Log Message:
BUG: Fix color check for dependency scanning

Generation of color rules for dependency scanning messages did not
account for disabling color at generation time.  See issue #7814.


Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -C 2 -d -r1.83 -r1.84
*** cmLocalUnixMakefileGenerator3.h	9 Oct 2008 19:30:07 -0000	1.83
--- cmLocalUnixMakefileGenerator3.h	15 Oct 2008 14:40:57 -0000	1.84
***************
*** 194,197 ****
--- 194,200 ----
                    EchoColor color = EchoNormal);
  
+   /** Get whether the makefile is to have color.  */
+   bool GetColorMakefile() const { return this->ColorMakefile; }
+ 
    virtual std::string GetTargetDirectory(cmTarget const& target) const;
  

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.108
retrieving revision 1.109
diff -C 2 -d -r1.108 -r1.109
*** cmMakefileTargetGenerator.cxx	15 Oct 2008 14:21:21 -0000	1.108
--- cmMakefileTargetGenerator.cxx	15 Oct 2008 14:40:57 -0000	1.109
***************
*** 1032,1037 ****
           << " "
           << this->Convert(this->InfoFileNameFull.c_str(),
!                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
!          << " --color=$(COLOR)";
    commands.push_back(depCmd.str());
  
--- 1032,1040 ----
           << " "
           << this->Convert(this->InfoFileNameFull.c_str(),
!                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL);
!   if(this->LocalGenerator->GetColorMakefile())
!     {
!     depCmd << " --color=$(COLOR)";
!     }
    commands.push_back(depCmd.str());