diff options
author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2011-02-20 02:51:55 +0300 |
---|---|---|
committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2011-02-20 02:51:55 +0300 |
commit | c37884b015a949bd03d1dac890263c93285291a1 (patch) | |
tree | 020022881c54edae293b1ec1e863be8af2eaa302 | |
parent | 43d362fcc8592cede760a56cf863a0c3eb80ff5f (diff) |
Add XF86keysym.h detection and use to CMake system, for r34983.
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/ghost/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 0 deletions
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") |