[cmake/msvc] Update python to 3.6 + numpy to 1.13.1
authorRay Molenkamp <github@lazydodo.com>
Wed, 20 Sep 2017 18:51:36 +0000 (12:51 -0600)
committerRay Molenkamp <github@lazydodo.com>
Wed, 20 Sep 2017 18:51:36 +0000 (12:51 -0600)
build_files/cmake/platform/platform_win32_msvc.cmake
source/creator/CMakeLists.txt

index 1b596e3d932b9e31078f4ff90d68e1fe9807246e..47dd0edc8ba265ccf5ee98307b7d48fae8294991 100644 (file)
@@ -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
index 98a5a6ce644bde81369a8fa6b9a87d823a1ad281..479c8b902e6d67f81749f1c8cf7f472acbb1af47 100644 (file)
@@ -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)