diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-03-04 17:15:46 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-03-04 17:15:46 +0300 |
commit | 8bc0033cb05ce193743f7a88a03518923a7ff24b (patch) | |
tree | 23fbae806fd59e271edb588df95290e5bae4f534 /CMakeLists.txt | |
parent | 24fa1d1f0434fe1c1a44cdcbe8537f37c0132749 (diff) |
Move CMake on Windows to use Python 3.2
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e8870fe977..76243b854fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |