Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 ceb16cb5f1)
This commit is contained in:
Camilla Löwy 2019-05-17 17:26:46 +02:00
parent 645b8c3bba
commit b383e70021
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -218,7 +218,7 @@ if (_GLFW_X11)
endif() endif()
# Check for XInput (modern HID input) # 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") message(FATAL_ERROR "The XInput headers were not found")
endif() endif()
@ -226,7 +226,7 @@ if (_GLFW_X11)
"${X11_Xinerama_INCLUDE_PATH}" "${X11_Xinerama_INCLUDE_PATH}"
"${X11_Xkb_INCLUDE_PATH}" "${X11_Xkb_INCLUDE_PATH}"
"${X11_Xcursor_INCLUDE_PATH}" "${X11_Xcursor_INCLUDE_PATH}"
"${X11_Xinput_INCLUDE_PATH}") "${X11_Xi_INCLUDE_PATH}")
endif() endif()
#-------------------------------------------------------------------- #--------------------------------------------------------------------