diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2017-09-20 21:51:36 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2017-09-20 21:51:36 +0300 |
| commit | 692631551fbf15a96cc1d9944549ea34f090b57e (patch) | |
| tree | 700117b10ffd3e028069dc407d8e4125dff099e4 | |
| parent | 25f28d348fe1322da97c003c79d2d0e6e4267d1d (diff) | |
[cmake/msvc] Update python to 3.6 + numpy to 1.13.1
| -rw-r--r-- | build_files/cmake/platform/platform_win32_msvc.cmake | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake index 1b596e3d932..47dd0edc8ba 100644 --- a/build_files/cmake/platform/platform_win32_msvc.cmake +++ b/build_files/cmake/platform/platform_win32_msvc.cmake @@ -302,7 +302,7 @@ if(WITH_JACK) endif() if(WITH_PYTHON) - set(PYTHON_VERSION 3.5) # CACHE STRING) + set(PYTHON_VERSION 3.6) # CACHE STRING) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 98a5a6ce644..479c8b902e6 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -701,7 +701,7 @@ elseif(WIN32) ) if(WITH_PYTHON_INSTALL_NUMPY) - set(PYTHON_NUMPY_VERSION 1.10) + set(PYTHON_NUMPY_VERSION 1.13) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) |