diff options
| author | Adrian Page <adrian@pagenet.plus.com> | 2006-04-08 23:41:15 +0000 |
|---|---|---|
| committer | Adrian Page <adrian@pagenet.plus.com> | 2006-04-08 23:41:15 +0000 |
| commit | a1d53a7b0e72fc911d69c7225ae62cfc1f5d25bf (patch) | |
| tree | 80ef28b42d36ae32697fba6dece9affa813dfae6 | |
| parent | cba8933a83c2e96698b85b980438f30385f8420e (diff) | |
| download | extra-cmake-modules-a1d53a7b0e72fc911d69c7225ae62cfc1f5d25bf.tar.gz extra-cmake-modules-a1d53a7b0e72fc911d69c7225ae62cfc1f5d25bf.tar.bz2 | |
Add a check for Xinput.
svn path=/trunk/KDE/kdelibs/; revision=527638
| -rw-r--r-- | modules/FindX11.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index da103933..d6198f54 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -45,6 +45,7 @@ if (UNIX) FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) @@ -61,6 +62,7 @@ if (UNIX) FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -166,6 +168,11 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) + if (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + set(X11_Xinput_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) + endif (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + # Deprecated variable for backwards compatibility with CMake 1.4 if (X11_X11_INCLUDE_PATH) if (X11_LIBRARIES) @@ -295,6 +302,8 @@ if (UNIX) X11_Xscreensaver_INCLUDE_PATH X11_Xpm_INCLUDE_PATH X11_Xpm_LIB + X11_Xinput_LIB + X11_Xinput_INCLUDE_PATH ) endif (UNIX) |