diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 21:08:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 21:08:32 +0400 |
| commit | 47b9f5d8f83e330342fd22c5b56b2623bde06d8c (patch) | |
| tree | 0446fc03fdfbc2d34c1fbfb1c80bb7ccae286675 /source/creator | |
| parent | b805334cc283ea0126f81078830a3d6dcea97e40 (diff) | |
| parent | a8081c1d2bb9115833493b011bb93d6c08112b2d (diff) | |
svn merge ^/trunk/blender -r43443:43461
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 56612822887..b91080fa56e 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -629,10 +629,11 @@ elseif(APPLE) ) # python - if(WITH_PYTHON) + if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE) # 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 + # Not needed for PYTHON_MODULE or WEB_PLUGIN due uses Pyhon framework add_custom_target( extractpyzip DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python) |