[Orxonox-commit 2827] r7530 - code/branches/ois_update
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Oct 12 18:02:07 CEST 2010
Author: rgrieder
Date: 2010-10-12 18:02:07 +0200 (Tue, 12 Oct 2010)
New Revision: 7530
Modified:
code/branches/ois_update/CMakeLists.txt
Log:
Hope this fixes some more OS X problems.
Modified: code/branches/ois_update/CMakeLists.txt
===================================================================
--- code/branches/ois_update/CMakeLists.txt 2010-10-12 14:07:38 UTC (rev 7529)
+++ code/branches/ois_update/CMakeLists.txt 2010-10-12 16:02:07 UTC (rev 7530)
@@ -101,16 +101,20 @@
OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
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()
########### Subfolders and Subscripts ###########
More information about the Orxonox-commit
mailing list