Use simgear functions for clip and wrap around.

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffea91c25a74697d4308020adcc93ca25cdc2414..1952d7c86ee47ab9aab2e5fddf8da6d3690abba4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.gitignore)
 else()
     # clean tar-balls do not contain SCM (.git/.gitignore/...) files.
     set(CPACK_SOURCE_IGNORE_FILES
-      "^${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore;Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}")
+      "Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}")
 endif()
 
+list (APPEND CPACK_SOURCE_IGNORE_FILES "${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore")
+
 # split version string into components, note CMAKE_MATCH_0 is the entire regexp match
 string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CPACK_PACKAGE_VERSION ${FLIGHTGEAR_VERSION} )
 set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) 
@@ -44,7 +46,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3})
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
 SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README")
 
-set(CPACK_SOURCE_GENERATOR TBZ2 ZIP)
+set(CPACK_SOURCE_GENERATOR TBZ2)
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "flightgear-${FLIGHTGEAR_VERSION}" CACHE INTERNAL "tarball basename")
 
 include (CPack)
@@ -63,7 +65,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 +82,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 +165,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 +196,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)
@@ -201,7 +227,9 @@ if(ENABLE_LIBSVN)
 endif(ENABLE_LIBSVN)
 
 find_package(PLIB REQUIRED puaux pu js fnt)
-find_package(SimGear 2.5.0 REQUIRED)
+
+# FlightGear and SimGear versions need to match
+find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
 
 if (JPEG_FACTORY)
     # check simgear was built with JPEG-factory support
@@ -276,6 +304,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} )