From 090b16bfae282606472f876d6b2fd23fa28e1564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Tue, 7 May 2019 17:03:55 +0200 Subject: [PATCH] X11: Fix CMake not checking for XInput2 headers Fixes #1480. --- CMakeLists.txt | 8 +++++++- README.md | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 657fd09f..a72f8bc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,10 +230,16 @@ if (_GLFW_X11) message(FATAL_ERROR "The Xcursor headers were not found") endif() + # Check for XInput (modern HID input) + if (NOT X11_Xinput_INCLUDE_PATH) + message(FATAL_ERROR "The XInput headers were not found") + endif() + list(APPEND glfw_INCLUDE_DIRS "${X11_Xrandr_INCLUDE_PATH}" "${X11_Xinerama_INCLUDE_PATH}" "${X11_Xkb_INCLUDE_PATH}" - "${X11_Xcursor_INCLUDE_PATH}") + "${X11_Xcursor_INCLUDE_PATH}" + "${X11_Xinput_INCLUDE_PATH}") endif() #-------------------------------------------------------------------- diff --git a/README.md b/README.md index 017cd5fc..3277985c 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,7 @@ information on what to include when reporting a bug. - Bugfix: The CMake config-file package used an absolute path and was not relocatable (#1470) + - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480) ## Contact