From c37884b015a949bd03d1dac890263c93285291a1 Mon Sep 17 00:00:00 2001 From: "Guillermo S. Romero" Date: Sat, 19 Feb 2011 23:51:55 +0000 Subject: [PATCH] Add XF86keysym.h detection and use to CMake system, for r34983. --- CMakeLists.txt | 1 + intern/ghost/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4bc1c74315..440170e332c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,6 +338,7 @@ if(UNIX AND NOT APPLE) 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}") diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index b77236acf41..33185a63d5b 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -134,6 +134,11 @@ elseif(UNIX) 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")