mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 21:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

X11: Fix CMake not checking for XInput2 headers

Browse Source 
Fixes #1480.

(cherry picked from commit 090b16bfae)
This commit is contained in:
Camilla Löwy 2019-05-07 17:03:55 +02:00
parent e826f839a4
commit 9cc83cf07f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -230,10 +230,16 @@ if (_GLFW_X11)
message(FATAL_ERROR "The Xcursor headers were not found") message(FATAL_ERROR "The Xcursor headers were not found")
endif() 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}" list(APPEND glfw_INCLUDE_DIRS "${X11_Xrandr_INCLUDE_PATH}"
"${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}")
endif() endif()
#-------------------------------------------------------------------- #--------------------------------------------------------------------

1
README.md
View File

@ -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 - Bugfix: The CMake config-file package used an absolute path and was not
relocatable (#1470) relocatable (#1470)
- [X11] Bugfix: The CMake files did not check for the XInput headers (#1480)
## Contact ## Contact