summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Huff <don.huff@eyeverify.com>2016-03-11 13:58:27 (GMT)
committerDon Huff <don.huff@eyeverify.com>2016-03-11 13:58:27 (GMT)
commitd254052f7fe697d0acb8a746d73596bebd4302ca (patch)
treeb67b147024dde7151279cd118ca576840bdc40dc
parent407b0aaf856a5bb8695fd41e99d8885614e5aabe (diff)
downloadgoogletest-d254052f7fe697d0acb8a746d73596bebd4302ca.zip
googletest-d254052f7fe697d0acb8a746d73596bebd4302ca.tar.gz
googletest-d254052f7fe697d0acb8a746d73596bebd4302ca.tar.bz2
Update C++ language and library settings to match SDK projects.refs/pull/725/head
-rw-r--r--.gitignore1
-rw-r--r--googletest/xcode/gtest.xcodeproj/project.pbxproj6
2 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ce310bc..74e7466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
# Ignore CI build directory
build/
+xcuserdata
diff --git a/googletest/xcode/gtest.xcodeproj/project.pbxproj b/googletest/xcode/gtest.xcodeproj/project.pbxproj
index 89889b4..003bff8 100644
--- a/googletest/xcode/gtest.xcodeproj/project.pbxproj
+++ b/googletest/xcode/gtest.xcodeproj/project.pbxproj
@@ -1067,6 +1067,9 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */;
buildSettings = {
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Debug;
};
@@ -1074,6 +1077,9 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */;
buildSettings = {
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Release;
};