[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34998] trunk/blender: Add XF86keysym. h detection and use to CMake system, for r34983.

[gsr b3d]

Revision: 34998
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34998
Author:   gsrb3d
Date:     2011-02-19 23:51:55 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Add XF86keysym.h detection and use to CMake system, for r34983.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34983

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-02-19 23:51:18 UTC (rev 34997)
+++ trunk/blender/CMakeLists.txt	2011-02-19 23:51:55 UTC (rev 34998)
@@ -338,6 +338,7 @@
 	endif()
 
 	find_package(X11 REQUIRED)
+	find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
 
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt	2011-02-19 23:51:18 UTC (rev 34997)
+++ trunk/blender/intern/ghost/CMakeLists.txt	2011-02-19 23:51:55 UTC (rev 34998)
@@ -134,6 +134,11 @@
 
 	add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
 
+	if(X11_XF86keysym_INCLUDE_PATH)
+		add_definitions(-DWITH_XF86KEYSYM)
+		list(APPEND INC ${X11_XF86keysym_INCLUDE_PATH})
+	endif()
+
 elseif(WIN32)
 	if(MSVC)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")