CMake/OSX: Bugfix [#26375]: Add default values for the OSX architecture: x86_64 (also used to select the python dynlibs that'll be bundled with the application).

Set deployment target to be 10.5 by default.

Fix broken build introduced by recent source/creator/CMakeList.txt cleanup
This commit is contained in:
Damien Plisson
2011-03-07 21:28:36 +00:00
parent c39a109dae
commit df3688a05d
2 changed files with 16 additions and 0 deletions

View File

@@ -139,6 +139,16 @@ option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_ass
mark_as_advanced(WITH_ASSERT_ABORT)
if(APPLE)
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
FORCE)
endif()
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5 CACHE STRING
"Choose the minimum OSX version required: 10.4 or 10.5"
FORCE)
endif()
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -734,6 +744,10 @@ elseif(WIN32)
elseif(APPLE)
if (${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5")
set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE)
endif()
if(WITH_LIBS10.5)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
else()