kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2009-07-21 11:58:43 -04:00
parent 924dd34451
commit 04b834f1b4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -120,7 +120,10 @@ void cmLocalUnixMakefileGenerator3::Generate()
// Record whether some options are enabled to avoid checking many // Record whether some options are enabled to avoid checking many
// times later. // times later.
this->ColorMakefile = this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE"); if(!this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile())
{
this->ColorMakefile = this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE");
}
this->SkipPreprocessedSourceRules = this->SkipPreprocessedSourceRules =
this->Makefile->IsOn("CMAKE_SKIP_PREPROCESSED_SOURCE_RULES"); this->Makefile->IsOn("CMAKE_SKIP_PREPROCESSED_SOURCE_RULES");
this->SkipAssemblySourceRules = this->SkipAssemblySourceRules =