Martin Spott: Add CMake DBus support for event driven input.

Tested on Linux only, please improve if you see fit.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2c50db06e8ac10f606055520852688f621e0c6b..fe7610f4f68cb8048fc9b54cd4b4d6c73d444480 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,7 @@ endif()
 
 if(EVENT_INPUT)
        message(STATUS "checking event-based Input")
+       find_package(DBus)
        IF(APPLE)
 
        elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index e0d6abd30ca1065516d7ad69bec3f301bab9c545..1a2df52d269614a08bc4a125d5b011f5ca58f6fa 100644 (file)
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -1,9 +1,11 @@
 include(FlightGearComponent)
 
-set(EVENT_INPUT_SOURCES
-       FGLinuxEventInput.cxx
-       FGMacOSXEventInput.cxx
-       )
+IF(APPLE)
+       set(EVENT_INPUT_SOURCES FGMacOSXEventInput.cxx)
+else()
+       set(EVENT_INPUT_SOURCES FGLinuxEventInput.cxx)
+endif()
+
 
 set(SOURCES
        FGButton.cxx
@@ -18,6 +20,7 @@ set(SOURCES
        
 if(EVENT_INPUT)
        list(APPEND SOURCES ${EVENT_INPUT_SOURCES})
+       include_directories(${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
 endif()
        
 set(FGJS_SOURCES