Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7530


Ignore:
Timestamp:
Oct 12, 2010, 6:02:07 PM (14 years ago)
Author:
rgrieder
Message:

Hope this fixes some more OS X problems.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ois_update/CMakeLists.txt

    r7519 r7530  
    102102
    103103IF(APPLE)
     104  # Set 10.5 as the base SDK by default
     105  SET(XCODE_ATTRIBUTE_SDKROOT macosx10.5)
     106
     107  # 10.6 sets x86_64 as the default architecture.
     108  # Because Carbon isn't supported on 64-bit and we still need it, force the architectures to ppc and i386
     109  IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
     110    SET(CMAKE_OSX_ARCHITECTURES "i386")
     111  ENDIF()
     112  IF(CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
     113    SET(CMAKE_OSX_ARCHITECTURES "ppc")
     114  ENDIF()
    104115  IF(NOT CMAKE_OSX_ARCHITECTURES)
    105116    SET(CMAKE_OSX_ARCHITECTURES "i386")
    106   ENDIF()
    107  
    108   # 10.6 sets x86_64 as the default architecture.
    109   # Because Carbon isn't supported on 64-bit and we still need it, force the architectures to ppc and i386
    110   IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
    111     STRING(REPLACE "x86_64" "" CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
    112     STRING(REPLACE "ppc64" "" CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
    113117  ENDIF()
    114118ENDIF()
Note: See TracChangeset for help on using the changeset viewer.