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

CMake: Setting vc10 to use Python 3.3 (it was still set to 3.2). For the time being, I'm having vc10 use the vc9 Python libs, which SCons is currently doing.

Browse Source
This commit is contained in:
Mitchell Stokes
2013-01-03 00:29:13 +00:00
parent c2839bfe76
commit fd8a2a5924
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -1098,14 +1098,16 @@ elseif(WIN32)
if(WITH_PYTHON) if(WITH_PYTHON)
# normally cached but not since we include them with blender # normally cached but not since we include them with blender
if(MSVC10) if(MSVC10)
set(PYTHON_VERSION 3.2) # CACHE STRING) set(PYTHON_VERSION 3.3) # CACHE STRING)
else() else()
set(PYTHON_VERSION 3.3) # CACHE STRING) set(PYTHON_VERSION 3.3) # CACHE STRING)
endif() endif()
set_lib_path(PYTHON "python") set_lib_path(PYTHON "python")
STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS) unset(_PYTHON_VERSION_NO_DOTS)
#Shared includes for both vc2008 and vc2010 #Shared includes for both vc2008 and vc2010