diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bb303f7..5665df21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,10 @@ include (CheckIncludeFile) include (CheckCXXSourceCompiles) include (CheckCXXCompilerFlag) +# 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(SimGear) # read 'version' file into a variable (stripping any newlines or spaces) @@ -299,6 +303,9 @@ 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(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++") endif() if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/simgear/misc/CocoaHelpers.mm b/simgear/misc/CocoaHelpers.mm index 028ccfb7..4b151307 100644 --- a/simgear/misc/CocoaHelpers.mm +++ b/simgear/misc/CocoaHelpers.mm @@ -28,11 +28,12 @@ SGPath appleSpecialFolder(int dirType, int domainMask, const SGPath& def) { CocoaAutoreleasePool ap; NSFileManager* fm = [NSFileManager defaultManager]; - NSURL* pathUrl = [fm URLForDirectory:dirType - inDomain:domainMask - appropriateForURL:Nil - create:YES - error:nil]; + NSSearchPathDirectory d = static_cast(dirType); + NSURL* pathUrl = [fm URLForDirectory:d + inDomain:domainMask + appropriateForURL:Nil + create:YES + error:nil]; if (!pathUrl) { return def;; }