[Bf-blender-cvs] [1807dcf] master: Fix numpy installation on windows+cmake

Sergey Sharybin noreply at git.blender.org
Wed Dec 10 09:47:40 CET 2014


Commit: 1807dcf619667e0ff509cb4c7e6b3ede85d56601
Author: Sergey Sharybin
Date:   Wed Dec 10 13:45:45 2014 +0500
Branches: master
https://developer.blender.org/rB1807dcf619667e0ff509cb4c7e6b3ede85d56601

Fix numpy installation on windows+cmake

The was caused by numpy never unpackign because of no
dpependnecy of any targets from the unpacked numpy.

Tried making it so blender target dpeends on it, but for
some reason it didn't work. For now added dedicated target
for unpacked numpy. A bit dirty but much better than just
totally failing.

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

M	source/creator/CMakeLists.txt

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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0e3b7a9..2b11913 100755
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -672,6 +672,7 @@ elseif(WIN32)
 					COMMAND ${CMAKE_COMMAND} -E tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.8.tar.gz"
 					DEPENDS ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.8.tar.gz
 					WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
+				add_custom_target(python_numpy ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy)
 				install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
 						DESTINATION ${BLENDER_VERSION}/python/lib/site-packages)
 			endif()




More information about the Bf-blender-cvs mailing list