Enable event-input for joysticks by default on Mac + Linux, in Cmake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a6d8232f8bfea500e6fc755e2b849b02cbc4880..eb74dd46267a91022ab817bccdba3cd12c59301c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,12 @@ else()
        set(HUDSON_BUILD_ID "none")
 endif()
 
+IF(APPLE)
+    set(EVENT_INPUT_DEFAULT 1)
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(EVENT_INPUT_DEFAULT 1)
+endif()
+
 find_package(Git)
 if (GIT_FOUND)
        execute_process(COMMAND git --git-dir ${PROJECT_SOURCE_DIR}/.git rev-parse  HEAD
@@ -67,7 +73,7 @@ option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" ON)
 option(ENABLE_YASIM "Set to ON to build FlightGear with YASIM FDM" ON)
 option(ENABLE_JSBSIM "Set to ON to build FlightGear with JSBSim FDM" ON)
 option(ENABLE_FGADMIN "Set to ON to build FlightGear with FGADMIN" ON)
-option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" OFF)
+option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" ${EVENT_INPUT_DEFAULT})
 option(ENABLE_LIBSVN "Set to ON to build FlightGear/terrasync with libsvnclient support" ON)
 option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF)
 option(WITH_FGPANEL "Set to ON to build the fgpanel application" ON)
@@ -98,20 +104,6 @@ if(SP_FDMS)
        set(ENABLE_SP_FDM 1)
 endif()
 
-if(EVENT_INPUT)
-       message(STATUS "checking event-based Input")
-       find_package(DBus)
-       IF(APPLE)
-
-       elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-
-       else()
-               message(WARNING "event input is not supported on this platform yet")
-       endif()
-else(EVENT_INPUT)
-       set(ENABLE_PLIB_JOYSTICK 1)
-endif(EVENT_INPUT)
-
 if (MSVC AND MSVC_3RDPARTY_ROOT)
   message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}")
   set( OSG_MSVC "msvc" )
@@ -135,6 +127,19 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
   set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
 endif (MSVC AND MSVC_3RDPARTY_ROOT)
 
+if(EVENT_INPUT)
+       message(STATUS "checking event-based Input")
+       
+       IF(APPLE)
+
+       elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        find_package(DBus)
+       else()
+               message(WARNING "event input is not supported on this platform yet")
+       endif()
+else(EVENT_INPUT)
+       set(ENABLE_PLIB_JOYSTICK 1)
+endif(EVENT_INPUT)
 
 # check required dependencies
 find_package(Boost REQUIRED)

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index 4c5939d4af7eaf80d135b2e30fc0b24ea17ec3bc..7fb713507596e012872969894890caa908736a7f 100644 (file)
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -2,8 +2,12 @@ include(FlightGearComponent)
 
 IF(APPLE)
        set(EVENT_INPUT_SOURCES FGMacOSXEventInput.cxx)
+       set(EVENT_INPUT_HEADERS FGMacOSXEventInput.hxx)
+else(MSVC)
+    message(STATUS "EventInput not implemented for Windows yet")
 else()
        set(EVENT_INPUT_SOURCES FGLinuxEventInput.cxx)
+       set(EVENT_INPUT_HEADERS FGLinuxEventInput.hxx)
 endif()
 
 
@@ -31,6 +35,7 @@ set(HEADERS
        
 if(EVENT_INPUT)
        list(APPEND SOURCES ${EVENT_INPUT_SOURCES})
+       list(APPEND SOURCES ${EVENT_INPUT_HEADERS})
        include_directories(${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
 endif()