[Cmake-commits] [cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx 1.267 1.268

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
BUG: Disable color makefile inside try-compile

Generated makefiles for try-compile projects should never use color
output.  On MSYS the color escapes end up in the try-compile output text
because there is no way to identify whether the output is going to a
color-capable terminal.  Instead we should just always skip color for
try-compile projects.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.267
retrieving revision 1.268
diff -C 2 -d -r1.267 -r1.268
*** cmLocalUnixMakefileGenerator3.cxx	8 Jul 2009 17:03:46 -0000	1.267
--- cmLocalUnixMakefileGenerator3.cxx	21 Jul 2009 15:58:43 -0000	1.268
***************
*** 121,125 ****
    // Record whether some options are enabled to avoid checking many
    // times later.
!   this->ColorMakefile = this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE");
    this->SkipPreprocessedSourceRules =
      this->Makefile->IsOn("CMAKE_SKIP_PREPROCESSED_SOURCE_RULES");
--- 121,128 ----
    // Record whether some options are enabled to avoid checking many
    // times later.
!   if(!this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile())
!     {
!     this->ColorMakefile = this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE");
!     }
    this->SkipPreprocessedSourceRules =
      this->Makefile->IsOn("CMAKE_SKIP_PREPROCESSED_SOURCE_RULES");