canvas.Layout: expose missing methods to Nasal.

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 311d5682faaea849d8d86691e197653439e5ffc2..1824861d3e0a8047c6ced495b18633ed8b5baa4d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
     endif()
 
     find_package(HtsEngine)
-    if(FLITE_FOUND)
+    if(HTS_ENGINE_FOUND)
         set(SYSTEM_HTS_ENGINE_DEFAULT 1)
     endif()
 endif()
@@ -168,7 +168,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 +186,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
@@ -229,28 +230,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
 
@@ -361,7 +340,6 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
 
 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)