Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ray Molenkamp
2017-09-20 12:51:36 -06:00
parent 25f28d348f
commit 692631551f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/platform/platform_win32_msvc.cmake
View File

@@ -302,7 +302,7 @@ if(WITH_JACK)
endif() endif()
if(WITH_PYTHON) 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}) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs

2
source/creator/CMakeLists.txt
View File

@@ -701,7 +701,7 @@ elseif(WIN32)
) )
if(WITH_PYTHON_INSTALL_NUMPY) 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 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
COMMAND ${CMAKE_COMMAND} -E COMMAND ${CMAKE_COMMAND} -E
make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)