Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-26 12:57:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-26 12:57:28 +0300
commitf2a8b74c2572258391c5847c177e59266aee3dab (patch)
tree0b3d7d1822beb32d335b0689bb04bb0a3a36f98c /source/creator
parent3b24ece297afc8ee648f91dbbe890d8aaee7e3bc (diff)
parentf78ba0df02a9734740d7ccddbe315020f56852f6 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 6d0cbb365b4..7a34f8bcb69 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1087,16 +1087,16 @@ elseif(APPLE)
# python
if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
- COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/python/"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/python/"
- COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}/python/"
+ OUTPUT ${PYTHON_EXTRACT_DIR}
+ COMMAND ${CMAKE_COMMAND} -E remove_directory "${PYTHON_EXTRACT_DIR}/"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_EXTRACT_DIR}/"
+ COMMAND ${CMAKE_COMMAND} -E chdir "${PYTHON_EXTRACT_DIR}/"
${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}"
DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
# copy extracted python files
install_dir(
- ${CMAKE_CURRENT_BINARY_DIR}/python
+ ${PYTHON_EXTRACT_DIR}
\${PLAYER_TARGETDIR_VER}
)
endif()