diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-01-03 04:29:13 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-01-03 04:29:13 +0400 |
| commit | fd8a2a592432b8693e0ffdad977e0d2529bbfc73 (patch) | |
| tree | 866313ce5a9733de1fa4a4934a3fbc48ea74ec10 /CMakeLists.txt | |
| parent | c2839bfe76139ed753e6b99118001bba5f2fa6ee (diff) | |
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.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fd5a3769b2a..6d63465641e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1098,14 +1098,16 @@ elseif(WIN32) if(WITH_PYTHON) # normally cached but not since we include them with blender if(MSVC10) - set(PYTHON_VERSION 3.2) # CACHE STRING) + set(PYTHON_VERSION 3.3) # CACHE STRING) else() set(PYTHON_VERSION 3.3) # CACHE STRING) endif() set_lib_path(PYTHON "python") 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) #Shared includes for both vc2008 and vc2010 |