[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37311] trunk/blender: cmake: remove python include in the wm module, set opengl as a system include.

Campbell Barton ideasman42 at gmail.com
Wed Jun 8 07:39:59 CEST 2011


Revision: 37311
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37311
Author:   campbellbarton
Date:     2011-06-08 05:39:58 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
cmake: remove python include in the wm module, set opengl as a system include.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-06-08 04:17:50 UTC (rev 37310)
+++ trunk/blender/CMakeLists.txt	2011-06-08 05:39:58 UTC (rev 37311)
@@ -1041,7 +1041,7 @@
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 find_package(OpenGL)
-blender_include_dirs("${OPENGL_INCLUDE_DIR}")
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
 # unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake 
 # unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake 
 

Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt	2011-06-08 04:17:50 UTC (rev 37310)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt	2011-06-08 05:39:58 UTC (rev 37311)
@@ -101,7 +101,6 @@
 
 if(WITH_PYTHON)
 	list(APPEND INC ../python)
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
 	add_definitions(-DWITH_PYTHON)
 
 	if(WITH_PYTHON_SECURITY)




More information about the Bf-blender-cvs mailing list