From e84e2b0025f1f1baea4f03aef86140ec60592302 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 5 Aug 2008 16:10:49 +0000 Subject: [PATCH] Merged in from svn/trunk of Eric Sokolowski's disabling of 64bit build under OSX. Merge command: svn merge -r 8741:8742 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk . --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc7ed3dcb..bdc72b956 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,7 +529,11 @@ IF(APPLE) # independently of OS X versions.) # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically. IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk) - SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE) + # 64-bit compiles are not supported with Carbon. We should enable + # 64-bit compilation by default once osgviewer has been + # rewritten with Cocoa. + #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE) + SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk) IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)