Commit 1438ed53 authored by Miro Knejp's avatar Miro Knejp

Switch objc tests to C++14 or it won't find std::experimental::optional

parent df8a6dc9
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
...@@ -658,13 +658,8 @@ ...@@ -658,13 +658,8 @@
65868B6E1989FE4200D60EEE /* Debug */ = { 65868B6E1989FE4200D60EEE /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
DSTROOT = /tmp/DjinniObjcTest.dst; DSTROOT = /tmp/DjinniObjcTest.dst;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
OTHER_CPLUSPLUSFLAGS = (
"-std=c++14",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = DjinniObjcTest; PRODUCT_NAME = DjinniObjcTest;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
...@@ -679,13 +674,8 @@ ...@@ -679,13 +674,8 @@
65868B6F1989FE4200D60EEE /* Release */ = { 65868B6F1989FE4200D60EEE /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
DSTROOT = /tmp/DjinniObjcTest.dst; DSTROOT = /tmp/DjinniObjcTest.dst;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
OTHER_CPLUSPLUSFLAGS = (
"-std=c++14",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = DjinniObjcTest; PRODUCT_NAME = DjinniObjcTest;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
...@@ -700,7 +690,6 @@ ...@@ -700,7 +690,6 @@
65868B711989FE4200D60EEE /* Debug */ = { 65868B711989FE4200D60EEE /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks", "$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)", "$(inherited)",
...@@ -725,7 +714,6 @@ ...@@ -725,7 +714,6 @@
65868B721989FE4200D60EEE /* Release */ = { 65868B721989FE4200D60EEE /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks", "$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)", "$(inherited)",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment