[Bf-blender-cvs] [692631551fb] master: [cmake/msvc] Update python to 3.6 + numpy to 1.13.1

Ray Molenkamp noreply at git.blender.org
Wed Sep 20 20:51:44 CEST 2017


Commit: 692631551fbf15a96cc1d9944549ea34f090b57e
Author: Ray Molenkamp
Date:   Wed Sep 20 12:51:36 2017 -0600
Branches: master
https://developer.blender.org/rB692631551fbf15a96cc1d9944549ea34f090b57e

[cmake/msvc] Update python to 3.6 + numpy to 1.13.1

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

M	build_files/cmake/platform/platform_win32_msvc.cmake
M	source/creator/CMakeLists.txt

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

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)



More information about the Bf-blender-cvs mailing list