[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53516] trunk/blender/CMakeLists.txt: CMake: Setting vc10 to use Python 3.3 (it was still set to 3.2).

[Mitchell Stokes]

Revision: 53516
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53516
Author:   moguri
Date:     2013-01-03 00:29:13 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-01-03 00:23:52 UTC (rev 53515)
+++ trunk/blender/CMakeLists.txt	2013-01-03 00:29:13 UTC (rev 53516)
@@ -1098,14 +1098,16 @@
 		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