[Cmake-commits] [cmake-commits] david.cole committed cmGlobalMSYSMakefileGenerator.cxx 1.14 1.15

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalMSYSMakefileGenerator.cxx 
Log Message:
BUG: Do not require CMAKE_AR in the MSYS Makefiles generator when enabling language "NONE".


Index: cmGlobalMSYSMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalMSYSMakefileGenerator.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** cmGlobalMSYSMakefileGenerator.cxx	22 Oct 2007 16:48:39 -0000	1.14
--- cmGlobalMSYSMakefileGenerator.cxx	1 Dec 2008 19:41:47 -0000	1.15
***************
*** 79,83 ****
    mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
    this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
!   if(!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile())
      {
      cmSystemTools::Error
--- 79,86 ----
    mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
    this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
! 
!   if(!mf->IsSet("CMAKE_AR") &&
!       !this->CMakeInstance->GetIsInTryCompile() &&
!       !(1==l.size() && l[0]=="NONE"))
      {
      cmSystemTools::Error