[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35352] trunk/blender/CMakeLists.txt: Move CMake on Windows to use Python 3.2
Nathan Letwory
nathan at letworyinteractive.com
Fri Mar 4 15:15:46 CET 2011
Revision: 35352
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35352
Author: jesterking
Date: 2011-03-04 14:15:46 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
Move CMake on Windows to use Python 3.2
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-03-04 14:13:50 UTC (rev 35351)
+++ trunk/blender/CMakeLists.txt 2011-03-04 14:15:46 UTC (rev 35352)
@@ -610,10 +610,10 @@
if(WITH_PYTHON)
set(PYTHON ${LIBDIR}/python)
- set(PYTHON_VERSION 3.1)
+ set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARY python31)
+ set(PYTHON_LIBRARY python32)
set(PYTHON_LIBPATH ${PYTHON}/lib)
endif()
@@ -715,6 +715,7 @@
set(WITH_JACK OFF)
endif()
+ # TODO: mingw move to Python 3.2
if(WITH_PYTHON)
set(PYTHON ${LIBDIR}/python)
set(PYTHON_VERSION 3.1)
@@ -766,9 +767,9 @@
set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib)
endif()
- set(PYTHON_VERSION 3.1)
+ set(PYTHON_VERSION 3.2)
- if(PYTHON_VERSION MATCHES 3.1)
+ if(PYTHON_VERSION MATCHES 3.2)
# we use precompiled libraries for py 3.1 and up by default
set(PYTHON ${LIBDIR}/python)
More information about the Bf-blender-cvs
mailing list