X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=bab8468189f3bfedfb294f1e3971cb60df987115;hb=263bc56b4ecfa08e08a6f116f5b6a52231dfa74b;hp=817733681322574f2bfaa888bc64fe481cbdb40b;hpb=73a519a95ce49db01f1b298de30e21a0d18f08f4;p=flightgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 817733681..bab846818 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,12 +73,6 @@ endif() # Configure library search paths ##################################################################################### -if(APPLE) - # Custom library directories for Mac, which should have precedence over any other - list(APPEND ADDITIONAL_LIBRARY_PATHS - ~/Library/Frameworks - /Library/Frameworks) -endif(APPLE) if(NOT "${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "") # Workaround for Ubuntu/Debian which introduced the "multiarch" library @@ -93,13 +87,6 @@ if(NOT "${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "") message(STATUS "additional library directories: ${ADDITIONAL_LIBRARY_PATHS}") endif() -if(NOT MSVC) - # TBD: are these really necessary? Aren't they considered by cmake automatically? - list(APPEND ADDITIONAL_LIBRARY_PATHS - /opt/local - /usr/local - /usr) -endif() ##################################################################################### IF(APPLE) @@ -109,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) @@ -127,6 +115,16 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") if(GSM_FOUND) set(SYSTEM_GSM_DEFAULT 1) endif(GSM_FOUND) + + find_package(Flite) + if(FLITE_FOUND) + set(SYSTEM_FLITE_DEFAULT 1) + endif() + + find_package(HtsEngine) + if(HTS_ENGINE_FOUND) + set(SYSTEM_HTS_ENGINE_DEFAULT 1) + endif() endif() find_package(Git) @@ -142,7 +140,7 @@ endif() # FlightGear build options option(SIMGEAR_SHARED "Set to ON when SimGear was built as a shared library" OFF) option(LOGGING "Set to ON to build FlightGear with logging support (default)" ON) -option(JSBSIM_TERRAIN "Set to ON to build FlightGear with JSBSim terrain handling code" OFF) +option(JSBSIM_TERRAIN "Set to ON to build FlightGear with JSBSim terrain handling code" ON) option(SP_FDMS "Set to ON to build FlightGear with special-purpose FDMs" OFF) option(ENABLE_UIUC_MODEL "Set to ON to build FlightGear with UIUCModel FDM" OFF) option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" OFF) @@ -156,6 +154,8 @@ option(ENABLE_IAX "Set to ON to build FlightGear with IAXClient/fgcom bui option(USE_DBUS "Set to ON to build FlightGear with DBus screensaver interaction (default on Linux)" ${USE_DBUS_DEFAULT}) option(SYSTEM_SPEEX "Set to ON to build IAXClient with the system's speex and speexdsp library" ${SYSTEM_SPEEX_DEFAULT}) option(SYSTEM_GSM "Set to ON to build IAXClient with the system's GSM library" ${SYSTEM_GSM_DEFAULT}) +option(SYSTEM_FLITE "Set to ON to build Flightgear with the system's Flite library" ${SYSTEM_FLITE_DEFAULT}) +option(SYSTEM_HTS_ENGINE "Set to ON to build Flightgear with the system's HTS Engine library" ${SYSTEM_HTS_ENGINE_DEFAULT}) # additional utilities option(ENABLE_FGADMIN "Set to ON to build the FGADMIN application (default)" ON) @@ -169,6 +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" 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.0.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,18 +344,22 @@ 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 - this should be cleaned up include_directories(${PROJECT_BINARY_DIR}/src) include_directories(${PROJECT_BINARY_DIR}/src/Include) +if (ENABLE_FLITE) + include_directories(${PROJECT_SOURCE_DIR}/3rdparty/hts_engine_API/include ) + include_directories(${PROJECT_SOURCE_DIR}/3rdparty/flite_hts_engine/include ) +endif() + add_definitions(-DHAVE_CONFIG_H) check_function_exists(mkfifo HAVE_MKFIFO)