Skip to content

Commit

Permalink
X11: Fix CMake check for XInput headers
Browse files Browse the repository at this point in the history
The X11_Xinput_* variables have been removed in recent CMake, leaving
only the X11_Xi_* set.

Related to #1480.

(cherry picked from commit ceb16cb)
  • Loading branch information
elmindreda committed May 19, 2019
1 parent 645b8c3 commit b383e70
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -218,15 +218,15 @@ 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()

list(APPEND glfw_INCLUDE_DIRS "${X11_Xrandr_INCLUDE_PATH}"
"${X11_Xinerama_INCLUDE_PATH}"
"${X11_Xkb_INCLUDE_PATH}"
"${X11_Xcursor_INCLUDE_PATH}"
"${X11_Xinput_INCLUDE_PATH}")
"${X11_Xi_INCLUDE_PATH}")
endif()

#--------------------------------------------------------------------
Expand Down

0 comments on commit b383e70

Please sign in to comment.