From b383e70021bc875e6fb5c1a693e5aa85fbc160d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Fri, 17 May 2019 17:26:46 +0200 Subject: [PATCH] X11: Fix CMake check for XInput headers The X11_Xinput_* variables have been removed in recent CMake, leaving only the X11_Xi_* set. Related to #1480. (cherry picked from commit ceb16cb5f11b078010a669bab817d8927f8a99b7) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01c75680..e3af22e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,7 +218,7 @@ if (_GLFW_X11) endif() # Check for XInput (modern HID input) - if (NOT X11_Xinput_INCLUDE_PATH) + if (NOT X11_Xi_INCLUDE_PATH) message(FATAL_ERROR "The XInput headers were not found") endif() @@ -226,7 +226,7 @@ if (_GLFW_X11) "${X11_Xinerama_INCLUDE_PATH}" "${X11_Xkb_INCLUDE_PATH}" "${X11_Xcursor_INCLUDE_PATH}" - "${X11_Xinput_INCLUDE_PATH}") + "${X11_Xi_INCLUDE_PATH}") endif() #--------------------------------------------------------------------