Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-03-07 06:33:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-03-07 06:33:33 +0300
commite1649ecda9d7f00bf14f680b972fd96905662992 (patch)
treec4dc1aacef3878933bfd2c443f8fbbd03e1114bb /CMakeLists.txt
parent12ec60ca46a273c590fd1ebf9e5eb298e2bfc407 (diff)
use install target for CMake Windows (msvc and mingw), for MinGW you now need to run 'make install', for MSVC the 'INSTALL' target needs to be enabled in the project file
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 047498d154e..368f5de0261 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -718,13 +718,12 @@ 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)
+ set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARY python31mw)
+ set(PYTHON_LIBRARY python32mw)
set(PYTHON_LIBPATH ${PYTHON}/lib)
endif()