From 97d71393cc5cfb1528d3ef99fa63699405b661c3 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 19 May 2013 08:16:19 +0200 Subject: [PATCH] Made CMake file require XInput. --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da295a6a..af8b0787 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,15 +172,18 @@ if (_GLFW_X11) message(FATAL_ERROR "The RandR library and headers were not found") endif() - if (X11_Xinput_FOUND) - list(APPEND glfw_INCLUDE_DIRS ${X11_Xinput_INCLUDE_PATH}) - list(APPEND glfw_LIBRARIES ${X11_Xinput_LIB}) - endif() - list(APPEND glfw_INCLUDE_DIRS ${X11_Xrandr_INCLUDE_PATH}) list(APPEND glfw_LIBRARIES ${X11_Xrandr_LIB}) set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} xrandr") + # Check for XInput (high-resolution cursor motion) + if (NOT X11_Xinput_FOUND) + message(FATAL_ERROR "The XInput library and headers were not found") + endif() + + list(APPEND glfw_INCLUDE_DIRS ${X11_Xinput_INCLUDE_PATH}) + list(APPEND glfw_LIBRARIES ${X11_Xinput_LIB}) + # Check for Xf86VidMode (fallback gamma control) if (NOT X11_xf86vmode_FOUND) message(FATAL_ERROR "The Xf86VidMode library and headers were not found")