Explicitly force libc++ on clang
This commit is contained in:
parent
0cc5374fe7
commit
1bf0b7222d
@ -313,6 +313,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")
|
||||
|
@ -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<NSSearchPathDirectory>(dirType);
|
||||
NSURL* pathUrl = [fm URLForDirectory:d
|
||||
inDomain:domainMask
|
||||
appropriateForURL:Nil
|
||||
create:YES
|
||||
error:nil];
|
||||
if (!pathUrl) {
|
||||
return def;;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user