-Revert to the original design. It still appearch to yield the best scheduling results.

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb74dd46267a91022ab817bccdba3cd12c59301c..221efc659926bc6555097246ccd79a749d56f0b7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ project(FlightGear)
 
 set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
 set(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
-set(CMAKE_RELWITHDEBINFO_POSTFIX "rd" CACHE STRING "add a postfix, usually empty on windows")
-set(CMAKE_MINSIZEREL_POSTFIX "s" CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_MINSIZEREL_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
 
 # read 'version' file into a variable (stripping any newlines or spaces)
 file(READ version versionFile)
@@ -52,7 +52,8 @@ endif()
 IF(APPLE)
     set(EVENT_INPUT_DEFAULT 1)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(EVENT_INPUT_DEFAULT 1)
+    # disabled while DBus / HAL / udev issues are decided
+    #set(EVENT_INPUT_DEFAULT 1)
 endif()
 
 find_package(Git)
@@ -78,6 +79,7 @@ option(ENABLE_LIBSVN "Set to ON to build FlightGear/terrasync with libsvnclient
 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)
 
+
 if (MSVC)
   GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
   if (CMAKE_CL_64)
@@ -134,6 +136,11 @@ if(EVENT_INPUT)
 
        elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
         find_package(DBus)
+        if(NOT DBUS_FOUND)
+            message(WARNING "DBus not found, event input will be disabled")
+            set(EVENT_INPUT 0)
+        endif()
+        
        else()
                message(WARNING "event input is not supported on this platform yet")
        endif()