Revision: 21798
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21798
Author: broken
Date: 2009-07-22 14:43:37 +0200 (Wed, 22 Jul 2009)
Log Message:
-----------
* Updated CMake files to build with Python 3.1 on OS X by default. Remember to
update /lib to get the precompiled libraries!
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-07-22 11:52:42 UTC (rev
21797)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-07-22 12:43:37 UTC (rev
21798)
@@ -339,17 +339,29 @@
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
- SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
- SET(PYTHON_VERSION 2.5)
- SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}"
CACHE STRING "")
- SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}
CACHE STRING "")
- SET(PYTHON_LIB "")
- SET(PYTHON_LIBPATH
${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
- IF(CMAKE_SYSTEM_VERSION GREATER 10.4)
- SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework
Python")
- ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4)
+
+ SET(PYTHON_VERSION 3.1)
+
+ IF(PYTHON_VERSION MATCHES 3.1)
+ # we use precompiled libraries for py 3.1 and up by default
+
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_LIB python${PYTHON_VERSION})
+ SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_LINKFLAGS "-u _PyMac_Error")
+ ELSE(PYTHON_VERSION MATCHES 3.1)
+ # otherwise, use custom system framework
+
+ SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
+ SET(PYTHON_VERSION 2.5)
+ SET(PYTHON_INC
"${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}
CACHE STRING "")
+ SET(PYTHON_LIB "")
+ SET(PYTHON_LIBPATH
${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
- ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4)
+ ENDIF(PYTHON_VERSION MATCHES 3.1)
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC "${GETTEXT}/include")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
