GUIMgr: prevent double init/shutdown

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9afd0951ef4d1e72047ec0f845d8818fbb7f2b2..1824861d3e0a8047c6ced495b18633ed8b5baa4d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
@@ -339,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)