Portability: Fix compile errors on MSVC (cmath)

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad1fb0fb901f19a1b65e8368fb58cf8966473632..c881c32205e0e35b37ada786eac1af5a1cce212a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6.4)
+cmake_minimum_required (VERSION 2.8.11)
 
 include (CheckFunctionExists)
 include (CheckCSourceCompiles)
@@ -14,10 +14,6 @@ if(COMMAND cmake_policy)
    endif()
 endif()
 
-# set this before project()
-# using 10.7 because boost requires libc++ and 10.6 doesn't include it
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)
-
 project(FlightGear)
 
 # We have some custom .cmake scripts not in the official distribution.
@@ -109,8 +105,12 @@ IF(APPLE)
     find_library(COCOA_LIBRARY Cocoa)
     list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
 
+    # 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)
@@ -169,6 +169,7 @@ 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)
 
 # additional utilities
 option(ENABLE_FGADMIN    "Set to ON to build the FGADMIN application (default)" ON)
@@ -231,7 +232,6 @@ 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
@@ -288,9 +288,6 @@ 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)
@@ -298,6 +295,8 @@ if (ENABLE_QT)
        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)
@@ -336,8 +335,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 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")
+   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)
@@ -357,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}")