From dd026ff017ea91edf99d21f655736ff9e9bd7635 Mon Sep 17 00:00:00 2001
From: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
Date: Mon, 17 Jul 2017 15:20:17 -0400
Subject: [PATCH] build: use C++14 language dialect
This commit makes the ios client compliant with C++14
Change-Id: I32934146c21a1ed26adc60789b0f5180aaef5b89
---
Ring/Ring.xcodeproj/project.pbxproj | 6 ++++--
compile-ios.sh | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Ring/Ring.xcodeproj/project.pbxproj b/Ring/Ring.xcodeproj/project.pbxproj
index af67e735b..8248cb855 100644
--- a/Ring/Ring.xcodeproj/project.pbxproj
+++ b/Ring/Ring.xcodeproj/project.pbxproj
@@ -1255,7 +1255,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+ CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1284,7 +1285,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+ CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
diff --git a/compile-ios.sh b/compile-ios.sh
index 66d26974e..8b7cb220e 100755
--- a/compile-ios.sh
+++ b/compile-ios.sh
@@ -120,7 +120,7 @@ do
CFLAGS+=" -O3"
fi
- CXXFLAGS="-stdlib=libc++ $CFLAGS"
+ CXXFLAGS="-stdlib=libc++ -std=c++14 $CFLAGS"
LDFLAGS="$CFLAGS"
./autogen.sh || exit 1
--
GitLab