Changeset 7530

Timestamp:

Oct 12, 2010, 6:02:07 PM (14 years ago)

Author:

rgrieder

Message:

Hope this fixes some more OS X problems.

File:

• code/branches/ois_update/CMakeLists.txt (modified) (1 diff)

code/branches/ois_update/CMakeLists.txt

@@ -102 +102 @@
 
 IF(APPLE)
+  # Set 10.5 as the base SDK by default
+  SET(XCODE_ATTRIBUTE_SDKROOT macosx10.5)
+
+  # 10.6 sets x86_64 as the default architecture.
+  # Because Carbon isn't supported on 64-bit and we still need it, force the architectures to ppc and i386
+  IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+    SET(CMAKE_OSX_ARCHITECTURES "i386")
+  ENDIF()
+  IF(CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
+    SET(CMAKE_OSX_ARCHITECTURES "ppc")
+  ENDIF()
   IF(NOT CMAKE_OSX_ARCHITECTURES)
     SET(CMAKE_OSX_ARCHITECTURES "i386")
-  ENDIF()
-  
-  # 10.6 sets x86_64 as the default architecture.
-  # Because Carbon isn't supported on 64-bit and we still need it, force the architectures to ppc and i386
-  IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
-    STRING(REPLACE "x86_64" "" CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
-    STRING(REPLACE "ppc64" "" CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
   ENDIF()
 ENDIF()