X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=bab8468189f3bfedfb294f1e3971cb60df987115;hb=263bc56b4ecfa08e08a6f116f5b6a52231dfa74b;hp=508552c69daf073edaed7525da3fea3f2134caaa;hpb=1c5c1b2cb159b8e32aecb0b8933c431e61bd9cb9;p=flightgear.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 508552c69..bab846818 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,10 +96,11 @@ IF(APPLE)
     find_library(COCOA_LIBRARY Cocoa)
     list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
 
-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+	${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
     set(USE_DBUS_DEFAULT 1)
-    find_package(UDev)
 
+    find_package(UDev)
     if(UDEV_FOUND)
         set(EVENT_INPUT_DEFAULT 1)
     endif(UDEV_FOUND)
@@ -168,7 +169,7 @@ option(ENABLE_JS_DEMO    "Set to ON to build the js_demo application (default)"
 option(ENABLE_METAR      "Set to ON to build the metar application (default)" ON)
 option(ENABLE_TESTS      "Set to ON to build test applications (default)" ON)
 option(ENABLE_FGCOM      "Set to ON to build the FGCom application (default)" ON)
-option(ENABLE_FLITE      "Set to ON to build the Flite text-to-speech module" OFF)
+option(ENABLE_FLITE      "Set to ON to build the Flite text-to-speech module" ON)
 
 if(LOGGING)
     # nothing
@@ -186,6 +187,7 @@ endif()
 
 if(ENABLE_FGCOM)
   set(ENABLE_IAX 1)
+  include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
 endif()
 
 # Setup MSVC 3rd party directories
@@ -218,7 +220,16 @@ find_package(ZLIB    REQUIRED)
 find_package(Threads REQUIRED)
 find_package(OpenGL  REQUIRED)
 find_package(OpenAL  REQUIRED)
-find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
+find_package(OpenSceneGraph 3.2.0 REQUIRED
+  osgText
+  osgSim
+  osgDB
+  osgParticle
+  osgFX
+  osgUtil
+  osgViewer
+  osgGA
+)
 
 if (MSVC)
 	find_package(CrashRpt)
@@ -229,28 +240,6 @@ if (MSVC)
 	endif()
 endif()
 
-if(ENABLE_FGADMIN)
-    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()
-
-        if ( CMAKE_DL_LIBS )
-            list(APPEND FLTK_LIBRARIES ${CMAKE_DL_LIBS})
-        endif()
-
-        message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
-    endif ( FLTK_FOUND )
-endif(ENABLE_FGADMIN)
-
 ##############################################################################
 ## Sqlite3 setup
 
@@ -355,13 +344,12 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
     ${OPENAL_INCLUDE_DIR}
-    ${SIMGEAR_INCLUDE_DIR}
+    ${SIMGEAR_INCLUDE_DIRS}
     ${PLIB_INCLUDE_DIR}
     ${SQLITE3_INCLUDED_DIR} )
 
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/src)
-include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
 # following is needed, because config.h is include 'bare', whereas
 # version.h is included as <Include/version.h> - this should be cleaned up
 include_directories(${PROJECT_BINARY_DIR}/src)