X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=44dcbd6aff7de4786975332c0328b9c681c054d8;hb=975a5202a8458a651d84a0a21c7ebbaf6b2100de;hp=ffea91c25a74697d4308020adcc93ca25cdc2414;hpb=c112b8b8e169a427e8cb0da871347e5c10031479;p=flightgear.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffea91c25..44dcbd6af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
-if($ENV{BUILD_ID})
+if(NOT "$ENV{BUILD_ID}" STREQUAL "")
 	set(HUDSON_BUILD_ID $ENV{BUILD_ID})
 	set(HUDSON_BUILD_NUMBER $ENV{BUILD_NUMBER})
 	message(STATUS "running under Hudson, build-number is ${HUDSON_BUILD_NUMBER}")
@@ -80,8 +80,11 @@ IF(APPLE)
     list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
 
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    # disabled while DBus / HAL / udev issues are decided
-    #set(EVENT_INPUT_DEFAULT 1)
+	find_package(UDev)
+
+	if(UDEV_FOUND)
+		set(EVENT_INPUT_DEFAULT 1)
+	endif(UDEV_FOUND)
 endif()
 
 find_package(Git)
@@ -160,19 +163,23 @@ 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)
-        if(NOT DBUS_FOUND)
-            message(WARNING "DBus not found, event input will be disabled")
-            set(EVENT_INPUT 0)
-        endif()
-        
+		if(NOT UDEV_FOUND)
+			message(WARNING "UDev not found, event input is disabled!")
+			set(EVENT_INPUT 0)
+		else()
+			set(EVENT_INPUT_LIBRARIES ${UDEV_LIBRARIES})
+		endif()
+
 	else()
 		message(WARNING "event input is not supported on this platform yet")
 	endif()
+
+	# Keep PLIB INPUT enabled as long as EventInput does not replace current joystick configurations.
+	set(ENABLE_PLIB_JOYSTICK 1)
 else(EVENT_INPUT)
 	set(ENABLE_PLIB_JOYSTICK 1)
 endif(EVENT_INPUT)
@@ -187,7 +194,24 @@ find_package(ALUT REQUIRED)
 find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
 
 if(ENABLE_FGADMIN)
-  find_package(FLTK)
+	find_package(FLTK)
+
+	if ( FLTK_FOUND )
+		if ( X11_Xinerama_FOUND )
+			message(STATUS "Found X11_Xinerama...")
+			list(APPEND FLTK_LIBRARIES ${X11_Xinerama_LIB})
+		endif()
+
+		if ( X11_Xft_FOUND )
+			message(STATUS "Found X11_Xft...")
+			list(APPEND FLTK_LIBRARIES ${X11_Xft_LIB})
+		endif()
+
+		set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} )
+		set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} )
+
+		message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
+	endif ( FLTK_FOUND )
 endif(ENABLE_FGADMIN)
 
 if(ENABLE_LIBSVN)
@@ -276,6 +300,7 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS}
 	${ZLIB_INCLUDE_DIR}
 	${ALUT_INCLUDE_DIR}
+	${OPENGL_INCLUDE_DIR}
 	${OPENAL_INCLUDE_DIR}
 	${SIMGEAR_INCLUDE_DIR}
 	${PLIB_INCLUDE_DIR} )