Commit: 47788b5e68b7b0f2b7a061a1dae8f4b1995b67e2
Author: Sergey Sharybin
Date: Wed Dec 10 13:50:51 2014 +0500
Branches: master
https://developer.blender.org/rB47788b5e68b7b0f2b7a061a1dae8f4b1995b67e2
Switch to numpy 1.9 for windows platform
===================================================================
M build_files/scons/tools/Blender.py
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index d09710a..eb2e57a 100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -654,7 +654,7 @@ def WinPyBundle(target=None, source=None, env=None):
# Extract Numpy
if env['WITH_BF_PYTHON_INSTALL_NUMPY']:
py_tar = env.subst(env['LCGDIR']).lstrip("#")
- py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','')
+ '_numpy_1.8.tar.gz'
+ py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','')
+ '_numpy_1.9.tar.gz'
py_target = env.subst(env['BF_INSTALLDIR']).lstrip("#")
py_target = os.path.join(py_target, VERSION, 'python', 'lib',
'site-packages')
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2b11913..21cb41d 100755
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -669,8 +669,8 @@ elseif(WIN32)
if(WITH_PYTHON_INSTALL_NUMPY)
add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
- 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
+ COMMAND ${CMAKE_COMMAND} -E tar xzvf
"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz"
+ DEPENDS
${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
