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:
authorThomas Dinges <blender@dingto.org>2012-08-14 20:53:40 +0400
committerThomas Dinges <blender@dingto.org>2012-08-14 20:53:40 +0400
commit211d30ea7f4abda6763aa6ee3eae840466eb05cc (patch)
tree72e2cea2f9f352fa084b8639b9474a2a5376f92f /CMakeLists.txt
parent58b5fb7bab9397955514ed5726ab0da9ab2a29bc (diff)
Cmake / Windows:
* Fix for Python include path when using msvc 2010.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77f934fcc15..edcfc7cc16e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -976,9 +976,10 @@ elseif(WIN32)
# normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
set_lib_path(PYTHON "python")
- set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION})
set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
-
+ #Shared includes for both vc2008 and vc2010
+ set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
+
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")