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

Move CMake on Windows to use Python 3.2

Browse Source
This commit is contained in:
Nathan Letwory
2011-03-04 14:15:46 +00:00
parent 24fa1d1f04
commit 8bc0033cb0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -610,10 +610,10 @@ elseif(WIN32)
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 @@ elseif(WIN32)
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 @@ elseif(APPLE)
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)