diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-26 16:38:40 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-26 16:38:40 +0400 |
| commit | 2d6402c10c920ddb29a47666f3f7a60642f701ff (patch) | |
| tree | c9c9416e315c8b09276da510e89aa930f69d960f /CMakeLists.txt | |
| parent | c2714a6a5bf9c54cbff7f3c8e37ce25f9c21e8a0 (diff) | |
Switch windows to python 3.3
Should affect on msvc2008 only, however scons with msvc2010 could still be broken.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 751c2dd548e..c40decc424b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1102,9 +1102,17 @@ elseif(WIN32) if(WITH_PYTHON) # normally cached but not since we include them with blender - set(PYTHON_VERSION 3.2) # CACHE STRING) + if(MSVC10) + set(PYTHON_VERSION 3.2) # CACHE STRING) + else() + set(PYTHON_VERSION 3.3) # CACHE STRING) + endif() + set_lib_path(PYTHON "python") - set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH + STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) + set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH + unset(_PYTHON_VERSION_NO_DOTS) + #Shared includes for both vc2008 and vc2010 set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION}) |