diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-10 11:50:51 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-10 11:50:51 +0300 |
| commit | 47788b5e68b7b0f2b7a061a1dae8f4b1995b67e2 (patch) | |
| tree | cb4d43dca93a674a1ad4b03b54ee92881419f8ab | |
| parent | 1807dcf619667e0ff509cb4c7e6b3ede85d56601 (diff) | |
Switch to numpy 1.9 for windows platform
| -rwxr-xr-x | build_files/scons/tools/Blender.py | 2 | ||||
| -rwxr-xr-x | source/creator/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index d09710a28fc..eb2e57ad793 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 2b119131987..21cb41ddfa2 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 |