Sync. with JSBSim again

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5acf71509bd2458fd65ec78af7956e632a7d070..950a10e45f265bdaf305529dc56776558e834754 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,10 +14,17 @@ if(COMMAND cmake_policy)
    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_OSX_DEPLOYMENT_TARGET 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}")
@@ -107,9 +114,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)
@@ -231,7 +240,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 +343,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)