X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=c881c32205e0e35b37ada786eac1af5a1cce212a;hb=f2d6b76b13d0bf4d96477761b66b5d30b1fcbd26;hp=80c579b4728b3acf8f15dba4d26cb1da426b3839;hpb=6c10f99573ec8046afb8a120d191a7d2e5e6c3af;p=flightgear.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80c579b47..c881c3220 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,19 @@
-cmake_minimum_required (VERSION 2.6.4)
+cmake_minimum_required (VERSION 2.8.11)
 
 include (CheckFunctionExists)
 include (CheckCSourceCompiles)
 include (CheckCXXSourceCompiles)
 include (CheckIncludeFile)
 
+if(COMMAND cmake_policy)
+   if(POLICY CMP0054)
+       cmake_policy(SET CMP0054 NEW)
+   endif()
+   if(POLICY CMP0042)
+       cmake_policy(SET CMP0042 NEW)
+   endif()
+endif()
+
 project(FlightGear)
 
 # We have some custom .cmake scripts not in the official distribution.
@@ -73,12 +82,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 +96,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,12 +105,39 @@ IF(APPLE)
     find_library(COCOA_LIBRARY Cocoa)
     list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
 
-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    find_package(UDev)
+    # using 10.7 because boost requires libc++ and 10.6 doesn't include it
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+	${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    find_package(Threads REQUIRED)
+    
+    set(USE_DBUS_DEFAULT 1)
 
+    find_package(UDev)
     if(UDEV_FOUND)
         set(EVENT_INPUT_DEFAULT 1)
     endif(UDEV_FOUND)
+
+    find_package(Speex)
+    find_package(Speexdsp)
+    if(SPEEX_FOUND AND SPEEXDSP_FOUND)
+        set(SYSTEM_SPEEX_DEFAULT 1)
+    endif(SPEEX_FOUND AND SPEEXDSP_FOUND)
+
+    find_package(Gsm)
+    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)
@@ -130,17 +153,23 @@ 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" 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)
 option(ENABLE_YASIM      "Set to ON to build FlightGear with YASIM FDM (default)" ON)
 option(ENABLE_JSBSIM     "Set to ON to build FlightGear with JSBSim FDM (default)" ON)
 option(EVENT_INPUT       "Set to ON to build FlightGear with event-based Input support" ${EVENT_INPUT_DEFAULT})
-option(ENABLE_LIBSVN     "Set to ON to build FlightGear/terrasync with libsvnclient support (default)" ON)
 option(ENABLE_RTI        "Set to ON to build FlightGear with RTI support" OFF)
 option(ENABLE_PROFILE    "Set to ON to build FlightGear with gperftools profiling support" OFF)
-option(JPEG_FACTORY      "Set to ON to build FlightGear with JPEG-factory support" OFF)
 option(SYSTEM_SQLITE     "Set to ON to build FlightGear with the system's SQLite3 library" OFF)
+option(ENABLE_IAX        "Set to ON to build FlightGear with IAXClient/fgcom built-in (default)" ON)
+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})
+option(FG_NIGHTLY        "Set to ON to mark this as a nightly build" OFF)
 
 # additional utilities
 option(ENABLE_FGADMIN    "Set to ON to build the FGADMIN application (default)" ON)
@@ -149,13 +178,13 @@ option(WITH_FGPANEL      "Set to ON to build the fgpanel application (default)"
 option(ENABLE_FGVIEWER   "Set to ON to build the fgviewer application (default)" ON)
 option(ENABLE_GPSSMOOTH  "Set to ON to build the GPSsmooth application (default)" ON)
 option(ENABLE_TERRASYNC  "Set to ON to build the terrasync application (default)" ON)
-
 option(ENABLE_FGJS       "Set to ON to build the fgjs application (default)" ON)
 option(ENABLE_JS_DEMO    "Set to ON to build the js_demo application (default)" ON)
-
 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)
+option(ENABLE_QT         "Set to ON to build the internal Qt launcher" ON)
 
 if(LOGGING)
     # nothing
@@ -163,10 +192,19 @@ else()
     set(FG_NDEBUG 1)
 endif()
 
+if(JSBSIM_TERRAIN)
+   set(JSBSIM_USE_GROUNDREACTIONS 1)
+endif()
+
 if(SP_FDMS)
     set(ENABLE_SP_FDM 1)
 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
 include( ConfigureMsvc3rdParty )
 
@@ -194,93 +232,82 @@ endif(EVENT_INPUT)
 # check required dependencies
 find_package(Boost   REQUIRED)
 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)
-
-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()
-
-        message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
-    endif ( FLTK_FOUND )
-endif(ENABLE_FGADMIN)
+find_package(OpenSceneGraph 3.2.0 REQUIRED
+  osgText
+  osgSim
+  osgDB
+  osgParticle
+  osgFX
+  osgUtil
+  osgViewer
+  osgGA
+)
 
-if(ENABLE_LIBSVN)
-    find_package(SvnClient)
+if (MSVC)
+	find_package(CrashRpt)
+	if (CRASHRPT_FOUND)
+		set(HAVE_CRASHRPT 1)
+		message(STATUS "Using CrashRpt")
+        include_directories( ${CRASHRPT_INCLUDE_DIR})
+	endif()
+endif()
 
-    if(LIBSVN_FOUND)
-        message(STATUS "libsvn found, enabling in terrasync")
-        set(HAVE_SVN_CLIENT_H 1)
-        set(HAVE_LIBSVN_CLIENT_1 1)
-    else()
-        message(STATUS "libsvn missing. Disabling...")
-    endif(LIBSVN_FOUND)
-endif(ENABLE_LIBSVN)
+##############################################################################
+## Sqlite3 setup
 
 if (SYSTEM_SQLITE)
     find_package(SQLite3 REQUIRED)
-    set(CMAKE_REQUIRED_INCLUDES ${SQLITE3_INCLUDED_DIR})
+
     message(STATUS "Using system SQLite3 library")
+else()
+    set(SQLITE3_INCLUDED_DIR "${CMAKE_SOURCE_DIR}/3rdparty/sqlite3")
+    # this target is defined in src/Navaids/CMakeLists.txt
+    list(APPEND SQLITE3_LIBRARY fgsqlite3)
 endif (SYSTEM_SQLITE)
 
 # Sqlite always depends on the threading lib
 list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
 
+##############################################################################
+## DBus setup
+
+if (USE_DBUS)
+    include(FindPkgConfig)
+    if (PKG_CONFIG_FOUND)
+        pkg_check_modules(DBUS dbus-1)
+    endif (PKG_CONFIG_FOUND) #if we don't have pkg-config, assume we don't have libdbus-1-dev either http://packages.debian.org/sid/libdbus-1-dev
+    if (DBUS_FOUND)
+        set(HAVE_DBUS 1)
+        message(STATUS "Using DBus")
+        include_directories( ${DBUS_INCLUDE_DIRS})
+    else()
+        message(STATUS "DBus not found, screensaver control disabled")
+    endif (DBUS_FOUND)
+else()
+endif (USE_DBUS)
+
+##############################################################################
+## Qt5 setup setup
+if (ENABLE_QT)
+	message(STATUS "Qt launcher enabled, checking for Qt 5.1 / qmake")
+	find_package(Qt5 5.1 COMPONENTS Widgets)
+	if (Qt5Widgets_FOUND)
+		message(STATUS "Will enable Qt launcher GUI")
+		message(STATUS "  Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}")
+		message(STATUS "  Qt5Widgets include dir: ${Qt5Widgets_INCLUDE_DIRS}")
+		set(HAVE_QT 1)
+	endif()
+endif (ENABLE_QT)
+##############################################################################
+
 find_package(PLIB REQUIRED puaux pu js fnt)
 
-if (EMBEDDED_SIMGEAR)
-    message(STATUS "Using embedded SimGear")
-    # create the same variables that FindSimGear would define
-    set(SIMGEAR_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/simgear)
-    set(SIMGEAR_CORE_LIBRARIES SimGearCore)
-    set(SIMGEAR_LIBRARIES SimGearScene)
-
-    if (NOT SIMGEAR_SHARED)
-        set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES
-            ${CMAKE_THREAD_LIBS_INIT}
-            ${ZLIB_LIBRARY}
-            ${LIBSVN_LIBRARIES}
-            ${WINMM_LIBRARY})
-
-        set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES 
-            ${OPENAL_LIBRARY})
-    endif()
-else(EMBEDDED_SIMGEAR)
-    # FlightGear and SimGear versions need to match
-    find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
-endif (EMBEDDED_SIMGEAR)
-
-if (JPEG_FACTORY)
-    # check simgear was built with JPEG-factory support
-    find_package(JPEG REQUIRED)
-    include_directories(${JPEG_INCLUDE_DIR})
-
-    set(CMAKE_REQUIRED_INCLUDES
-        ${SIMGEAR_INCLUDE_DIR}
-        ${JPEG_INCLUDE_DIR}
-        ${OPENSCENEGRAPH_INCLUDE_DIRS})
-
-    check_cxx_source_compiles(
-        "#include <simgear/screen/jpgfactory.hxx>
-        int main()    { return 0; } "
-        FG_JPEG_SERVER)
-
-    if (NOT FG_JPEG_SERVER)
-        message(STATUS "JPEG server support requested, but SimGear was built without JPEG support")
-    endif()
-endif()
+# FlightGear and SimGear versions need to match
+find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
+
+##############################################################################
 
 check_include_file(unistd.h   HAVE_UNISTD_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
@@ -293,10 +320,13 @@ if(ENABLE_PROFILE)
 endif()
 
 if(ENABLE_RTI)
+    message(STATUS "RTI: ENABLED")
     find_package(RTI)
     if(RTI_FOUND)
         set(FG_HAVE_HLA 1)
     endif(RTI_FOUND)
+else()
+    message(STATUS "RTI: DISABLED")
 endif(ENABLE_RTI)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -304,10 +334,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(WARNING_FLAGS_C   "-Wall")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 
-   set (WARNING_FLAGS_CXX "-Wall -Wno-overloaded-virtual")
-   set (WARNING_FLAGS_C   "-Wall")
-endif() 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+   set (WARNING_FLAGS_CXX "-Wall -Wno-overloaded-virtual -Wno-redeclared-class-member")
+   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
+   set (WARNING_FLAGS_C "-Wall")
+endif()
 
 if(WIN32)
 
@@ -317,7 +350,7 @@ if(WIN32)
         #     SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
         # endforeach(warning)
 
-        set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS")
+        set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS -Dstrdup=_strdup")
         if (${MSVC_VERSION} GREATER 1599)
             set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
         endif (${MSVC_VERSION} GREATER 1599)
@@ -326,7 +359,7 @@ if(WIN32)
     set(NOMINMAX 1)
 endif(WIN32)
 
-set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION")
+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS} -D_REENTRANT")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} -D_REENTRANT ${BOOST_CXX_FLAGS}")
@@ -337,16 +370,22 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
     ${OPENAL_INCLUDE_DIR}
-    ${SIMGEAR_INCLUDE_DIR}
-    ${PLIB_INCLUDE_DIR} )
+    ${SIMGEAR_INCLUDE_DIRS}
+    ${PLIB_INCLUDE_DIR}
+    ${SQLITE3_INCLUDED_DIR} )
 
+include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/src)
-
 # 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)
 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)
@@ -364,16 +403,9 @@ configure_file (
     "${PROJECT_BINARY_DIR}/src/Include/version.h"
 )
 
-if (EMBEDDED_SIMGEAR)
-    add_subdirectory(simgear)
-    # since we build without SimGear installed, we need to
-    # search this path directly to find the generated
-    # simgear_config.h
-    include_directories(${PROJECT_BINARY_DIR}/simgear)
-endif(EMBEDDED_SIMGEAR)
-
-add_subdirectory(src)
+add_subdirectory(3rdparty)
 add_subdirectory(utils)
+add_subdirectory(src)
 add_subdirectory(man)
 
 #-----------------------------------------------------------------------------