[Cmake-commits] [cmake-commits] hoffman committed cmGlobalXCodeGenerator.cxx 1.233 1.234

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
fix Xcode 30 generator 


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.233
retrieving revision 1.234
diff -C 2 -d -r1.233 -r1.234
*** cmGlobalXCodeGenerator.cxx	28 Sep 2009 15:42:41 -0000	1.233
--- cmGlobalXCodeGenerator.cxx	7 Oct 2009 12:15:14 -0000	1.234
***************
*** 2647,2662 ****
        osxArch = "$(ARCHS_STANDARD_32_64_BIT)";
        }
!     else if(this->XcodeVersion <= 25)
        {
- #ifdef __i386
-       osxArch = "i386";
- #endif
  #ifdef __ppc__
        osxArch = "ppc";
  #endif
!       }
!     else
!       {
!       osxArch = "$(ARCHS_STANDARD_32_BIT)";
        }
      buildSettings->AddAttribute("ONLY_ACTIVE_ARCH",
--- 2647,2662 ----
        osxArch = "$(ARCHS_STANDARD_32_64_BIT)";
        }
!     else if(this->XcodeVersion == 31)
!       {
!       osxArch = "$(ARCHS_STANDARD_32_BIT)";
!       }
!     else if(this->XcodeVersion <= 30)
        {
  #ifdef __ppc__
        osxArch = "ppc";
  #endif
! #ifdef __i386
!       osxArch = "i386";
! #endif
        }
      buildSettings->AddAttribute("ONLY_ACTIVE_ARCH",