diff options
| author | David Cole <david.cole@kitware.com> | 2008-12-01 19:41:47 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2008-12-01 19:41:47 (GMT) |
| commit | c37b45ee9f55c76b14ff0f46eea38de8cfa81a7f (patch) | |
| tree | f6aad2597948ce52361d0402bec105ee5f0edf6b /Source/cmGlobalMSYSMakefileGenerator.cxx | |
| parent | 1845925e8f7dc394c44ddfedb9b21d224c62b881 (diff) | |
| download | CMake-c37b45ee9f55c76b14ff0f46eea38de8cfa81a7f.zip CMake-c37b45ee9f55c76b14ff0f46eea38de8cfa81a7f.tar.gz CMake-c37b45ee9f55c76b14ff0f46eea38de8cfa81a7f.tar.bz2 | |
BUG: Do not require CMAKE_AR in the MSYS Makefiles generator when enabling language "NONE".
Diffstat (limited to 'Source/cmGlobalMSYSMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index e6d14b5..c07f7a6 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. ", |