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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-12-10 11:45:45 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-10 11:45:45 +0300
commit1807dcf619667e0ff509cb4c7e6b3ede85d56601 (patch)
tree077edbea90d30d32e824602f5f7a45ba7738967c /source/creator
parent8555595d172a4051a0be3557bfd009299578d52a (diff)
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.
Diffstat (limited to 'source/creator')
-rwxr-xr-xsource/creator/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0e3b7a91e00..2b119131987 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()