fly/flightgear
1
0
Fork 0
Code Activity

Fix UDev detection for HID-input

Browse source
This commit is contained in:
James Turner 2018-04-30 11:23:53 +01:00 committed by James Turner
parent cf5e2b39f1
commit 50518862fe
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -264,6 +264,10 @@ if(EVENT_INPUT)
if(NOT UDEV_FOUND) if(NOT UDEV_FOUND)
message(WARNING "UDev not found, event input is disabled!") message(WARNING "UDev not found, event input is disabled!")
set(EVENT_INPUT 0) set(EVENT_INPUT 0)
# HIDraw backend for hidapi also needs UDev, so also force
# HID-input to off in this scenario
set(ENABLE_HID_INPUT 0)
else() else()
add_definitions(-DWITH_EVENTINPUT) add_definitions(-DWITH_EVENTINPUT)
set(EVENT_INPUT_LIBRARIES ${UDEV_LIBRARIES}) set(EVENT_INPUT_LIBRARIES ${UDEV_LIBRARIES})
@ -281,6 +285,7 @@ if(EVENT_INPUT)
# Keep PLIB INPUT enabled as long as EventInput does not replace current joystick configurations. # Keep PLIB INPUT enabled as long as EventInput does not replace current joystick configurations.
set(ENABLE_PLIB_JOYSTICK 1) set(ENABLE_PLIB_JOYSTICK 1)
else(EVENT_INPUT) else(EVENT_INPUT)
message(STATUS "Event-based input disabled by config")
set(ENABLE_PLIB_JOYSTICK 1) set(ENABLE_PLIB_JOYSTICK 1)
endif(EVENT_INPUT) endif(EVENT_INPUT)