From 04b834f1b462e32d27c18ef1d5c6c1cc6ec1363f Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 21 Jul 2009 11:58:43 -0400 Subject: [PATCH] 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. --- Source/cmLocalUnixMakefileGenerator3.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 923e43f5c..2c365ed43 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -120,7 +120,10 @@ void cmLocalUnixMakefileGenerator3::Generate() // Record whether some options are enabled to avoid checking many // 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->Makefile->IsOn("CMAKE_SKIP_PREPROCESSED_SOURCE_RULES"); this->SkipAssemblySourceRules =