[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49896] trunk/blender/CMakeLists.txt: Cmake / Windows:

Thomas Dinges blender at dingto.org
Tue Aug 14 18:53:40 CEST 2012


Revision: 49896
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49896
Author:   dingto
Date:     2012-08-14 16:53:40 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Cmake / Windows:
* Fix for Python include path when using msvc 2010. 

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-08-14 15:38:10 UTC (rev 49895)
+++ trunk/blender/CMakeLists.txt	2012-08-14 16:53:40 UTC (rev 49896)
@@ -976,9 +976,10 @@
 			# 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}")




More information about the Bf-blender-cvs mailing list