X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=816fa80d9d2c98f1b1046852bd963873bbcab958;hb=2328f7fbdbf6ad9b1d107c026c57822fb088cc5e;hp=1824861d3e0a8047c6ced495b18633ed8b5baa4d;hpb=568dadc8980c9fb971fd5b71b93f6c4300adece5;p=flightgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1824861d3..816fa80d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,23 +1,35 @@ -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() + # Mac RPATH policy + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) + endif() +endif() + +if(APPLE) + # using 10.7 because boost requires libc++ and 10.6 doesn't include it + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7) + + set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks") + # when building, don't use the install RPATH already + # (but later on when installing) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +endif() + project(FlightGear) # We have some custom .cmake scripts not in the official distribution. set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}") -if(${CMAKE_VERSION} VERSION_GREATER 2.8.4) - # use official include provided by latest CMake - include(GNUInstallDirs) -else(${CMAKE_VERSION} VERSION_GREATER 2.8.4) - # backward compatibility: use our own module for older cmake versions - include(OldGNUInstallDirs) -endif(${CMAKE_VERSION} VERSION_GREATER 2.8.4) - # Warning when build is not an out-of-source build. string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" InSourceBuild) if(InSourceBuild) @@ -26,6 +38,7 @@ if(InSourceBuild) message(WARNING " mkdir ../fgbuild && cd ../fgbuild && cmake ${CMAKE_SOURCE_DIR}") endif(InSourceBuild) +include(GNUInstallDirs) # System detection/default settings include( DetectDistro ) include( DetectBrowser ) @@ -95,11 +108,14 @@ IF(APPLE) find_library(CORESERVICES_LIBRARY CoreServices) find_library(COCOA_LIBRARY Cocoa) list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY}) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR + ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + find_package(Threads REQUIRED) + find_package(X11 REQUIRED) -elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") set(USE_DBUS_DEFAULT 1) - find_package(UDev) + find_package(UDev) if(UDEV_FOUND) set(EVENT_INPUT_DEFAULT 1) endif(UDEV_FOUND) @@ -155,6 +171,8 @@ option(SYSTEM_SPEEX "Set to ON to build IAXClient with the system's speex a 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) +option(ENABLE_DEV_WARNINGS "Set to ON to include developer-warnings" OFF) # additional utilities option(ENABLE_FGADMIN "Set to ON to build the FGADMIN application (default)" ON) @@ -169,6 +187,7 @@ 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 @@ -216,10 +235,18 @@ 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.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) @@ -235,7 +262,7 @@ endif() if (SYSTEM_SQLITE) find_package(SQLite3 REQUIRED) - + message(STATUS "Using system SQLite3 library") else() set(SQLITE3_INCLUDED_DIR "${CMAKE_SOURCE_DIR}/3rdparty/sqlite3") @@ -264,9 +291,18 @@ if (USE_DBUS) else() endif (USE_DBUS) -# Sqlite always depends on the threading lib -list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT}) - +############################################################################## +## 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) @@ -301,10 +337,17 @@ 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 \ + -Wno-inconsistent-missing-override \ + -Wno-unused-local-typedef") + + 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) @@ -323,7 +366,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}") @@ -334,7 +377,7 @@ 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} )