Merged changes in the trunk up to revision 54802.
[blender.git] / source / creator / CMakeLists.txt
index 8fe7d5e6faf92b50231d4674113b673bd0225c37..7271e89461fa896ce0b1b54c748590319f0a95c3 100644 (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/