Revision: 35391
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35391
Author: damien78
Date: 2011-03-07 21:28:36 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-03-07 19:14:17 UTC (rev 35390)
+++ trunk/blender/CMakeLists.txt 2011-03-07 21:28:36 UTC (rev 35391)
@@ -139,6 +139,16 @@
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(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()
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-03-07 19:14:17 UTC (rev
35390)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-03-07 21:28:36 UTC (rev
35391)
@@ -185,6 +185,8 @@
if(MSVC)
# ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using
add_command
set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
+elseif(APPLE)
+ set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
else()
set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
