From: James Turner Date: Sun, 8 Feb 2015 13:46:09 +0000 (+0000) Subject: Force SDK version / C++ library on Mac. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f711306085ce720737dcf168c7673635c0c179e2;p=simgear.git Force SDK version / C++ library on Mac. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bb303f7..2c97bcb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ include (CheckIncludeFile) include (CheckCXXSourceCompiles) include (CheckCXXCompilerFlag) +# set this before project() +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) + project(SimGear) # read 'version' file into a variable (stripping any newlines or spaces) @@ -34,7 +37,7 @@ SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_CURRENT_BINARY_DIR};SimGear;ALL;/) # split version string into components, note CMAKE_MATCH_0 is the entire regexp match string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CPACK_PACKAGE_VERSION ${SIMGEAR_VERSION} ) -set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) +set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) set(CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_2}) set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3}) @@ -161,6 +164,12 @@ endif (MSVC AND MSVC_3RDPARTY_ROOT) if(APPLE) find_library(COCOA_LIBRARY Cocoa) + + # force libstdc++, not libc++ + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++") + list(APPEND CMAKE_CXX_FLAGS "-stdlib=libstdc++") + list(APPEND CMAKE_EXE_LINKER_FLAGS "-stdlib=libstdc++") + list(APPEND CMAKE_SHARED_LINKER_FLAGS "-stdlib=libstdc++") endif() # Somehow this only works if included before searching for Boost... @@ -175,12 +184,12 @@ if(SIMGEAR_HEADLESS) else() message(STATUS "SimGear mode: NORMAL") find_package(OpenGL REQUIRED) - + if (ENABLE_SOUND) find_package(OpenAL REQUIRED) message(STATUS "Sound support: ENABLED") endif(ENABLE_SOUND) - + find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgSim osgDB osgParticle osgGA osgViewer osgUtil) endif(SIMGEAR_HEADLESS) @@ -197,8 +206,8 @@ else() # XML_STATIC is important to avoid sg_expat_external.h # declaring symbols as declspec(import) add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC) - set(EXPAT_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/3rdparty/expat + set(EXPAT_INCLUDE_DIRS + ${PROJECT_SOURCE_DIR}/3rdparty/expat ${PROJECT_BINARY_DIR}/3rdparty/expat) endif(SYSTEM_EXPAT) @@ -275,12 +284,12 @@ SET(CMAKE_MINSIZEREL_POSTFIX "" CACHE STRING "add a postfix, usually empty on wi # isnan might not be real symbol, so can't check using function_exists check_cxx_source_compiles( - "#include + "#include int main() { return isnan(0.0);} " HAVE_ISNAN) check_cxx_source_compiles( - "#include + "#include int main() { return std::isnan(0.0);} " HAVE_STD_ISNAN) @@ -320,16 +329,16 @@ if(WIN32) # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996) # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # endforeach(warning) - + set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250 -Dstrdup=_strdup") if (${MSVC_VERSION} GREATER 1599) set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) endif (${MSVC_VERSION} GREATER 1599) endif(MSVC) - + # assumed on Windows set(HAVE_GETLOCALTIME 1) - + set( WINSOCK_LIBRARY "ws2_32.lib" ) set( RT_LIBRARY "winmm" ) endif(WIN32) @@ -338,15 +347,15 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") -# use BEFORE to ensure local directories are used first, +# use BEFORE to ensure local directories are used first, # ahead of system-installed libs include_directories(BEFORE ${PROJECT_SOURCE_DIR}) include_directories(BEFORE ${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include) include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear) -include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} +include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} ) @@ -399,5 +408,5 @@ CONFIGURE_FILE( IMMEDIATE @ONLY) ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - +