From 826784eb1825bc6f512308215034e4d0ad9917e3 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Mon, 13 Jun 2011 00:45:40 +0200 Subject: [PATCH] Martin Spott: Add CMake DBus support for event driven input. Tested on Linux only, please improve if you see fit. --- CMakeLists.txt | 1 + src/Input/CMakeLists.txt | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2c50db06..fe7610f4f 100644 --- 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 e0d6abd30..1a2df52d2 100644 --- 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 -- 2.39.5