[Bf-blender-cvs] [9179797811b] master: Fix blender player python installation on macOS after recent changes.

Brecht Van Lommel noreply at git.blender.org
Thu May 25 22:20:28 CEST 2017


Commit: 9179797811bb3eeb7400a66839effe6925ae2940
Author: Brecht Van Lommel
Date:   Thu May 25 21:42:52 2017 +0200
Branches: master
https://developer.blender.org/rB9179797811bb3eeb7400a66839effe6925ae2940

Fix blender player python installation on macOS after recent changes.

===================================================================

M	source/creator/CMakeLists.txt

===================================================================

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()




More information about the Bf-blender-cvs mailing list