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

Merged changes in the trunk up to revision 54802.

Browse Source
This commit is contained in:
Tamito Kajiyama
2013-02-24 03:39:20 +00:00
parent 3df023ae82 93c3593d82
commit d120ec146d
401 changed files with 4578 additions and 2960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/creator/CMakeLists.txt
View File

@@ -703,7 +703,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
@@ -756,7 +756,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/