From c37b45ee9f55c76b14ff0f46eea38de8cfa81a7f Mon Sep 17 00:00:00 2001 From: David Cole Date: Mon, 1 Dec 2008 14:41:47 -0500 Subject: [PATCH] BUG: Do not require CMAKE_AR in the MSYS Makefiles generator when enabling language "NONE". --- Source/cmGlobalMSYSMakefileGenerator.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index e6d14b5b4..c07f7a657 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -78,7 +78,10 @@ void cmGlobalMSYSMakefileGenerator mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str()); mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str()); this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); - if(!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile()) + + if(!mf->IsSet("CMAKE_AR") && + !this->CMakeInstance->GetIsInTryCompile() && + !(1==l.size() && l[0]=="NONE")) { cmSystemTools::Error ("CMAKE_AR was not found, please set to archive program. ",