Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

WITH_PYTHON_FRAMEWORK cmake option for OSX

Browse Source 
This option allow Blender to be linked against the Framework python
It's useful if you want to have blenderplayer and bpy in the same application and need to avoid PyThread problems.

patch reviewed by Jens Verwiebe before 2.66. He may want to change something though.
(also small: I changed:
/Library/Frameworks/Python.framework/Versions//python
by
/Library/Frameworks/Python.framework/Versions//Python
as the latter seems to be the norm)
This commit is contained in:
Dalai Felinto
2013-02-22 22:24:38 +00:00
parent b3c0896967
commit 3d9dc6a2e4
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/creator/CMakeLists.txt
View File

@@ -689,7 +689,7 @@ elseif(APPLE)
)
# python
if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# the python zip is first extract as part of the build process,
# and then later installed as part of make install. this is much
# quicker, and means we can easily exclude files on copy
@@ -742,7 +742,7 @@ elseif(APPLE)
)
# python
if(WITH_PYTHON)
if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/