Skip to content

Commit

Permalink
X11: Fix CMake not checking for XInput2 headers
Browse files Browse the repository at this point in the history
Fixes #1480.

(cherry picked from commit 090b16b)
  • Loading branch information
elmindreda committed May 19, 2019
1 parent e826f83 commit 9cc83cf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Expand Up @@ -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()

#--------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -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
Expand Down

0 comments on commit 9cc83cf

Please sign in to comment.