X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=816fa80d9d2c98f1b1046852bd963873bbcab958;hb=bfb539f09069829213852d6ffca22bbeb725c67d;hp=2a7d04fb4a78395c1dc318f8f5057e298d9ff014;hpb=a6b5ab7c748f896452657e8a0181643ab55ba303;p=flightgear.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a7d04fb4..816fa80d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,27 +9,27 @@ 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()
 
-project(FlightGear)
+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()
 
-# 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")
+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)
@@ -38,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 )
@@ -107,9 +108,11 @@ 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)
+
     set(USE_DBUS_DEFAULT 1)
 
     find_package(UDev)
@@ -169,6 +172,7 @@ option(SYSTEM_GSM        "Set to ON to build IAXClient with the system's GSM lib
 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)
@@ -231,7 +235,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
@@ -335,11 +338,15 @@ 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 -Wno-redeclared-class-member")
+   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")
+   set(WARNING_FLAGS_C "-Wall")
 endif()
 
 if(WIN32)