Merge pull request #354 from pivotal/Xcode7-support

Xcode7 Support
cedarbdd · Sep 16, 2015 · 7f43f30 · 7f43f30
2 parents 37b7c53 + 94e8a8d
commit 7f43f30
Show file tree

Hide file tree

Showing 40 changed files with 479 additions and 1,145 deletions.
diff --git a/Cedar.podspec b/Cedar.podspec
@@ -19,7 +19,8 @@ Pod::Spec.new do |s|
   #   https://github.com/pivotal/cedar/issues/47
   s.xcconfig = {
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++0x',
-    'CLANG_CXX_LIBRARY' => 'libc++'
+    'CLANG_CXX_LIBRARY' => 'libc++',
+    'OTHER_CFLAGS' => '-DDEVELOPER_BIN_DIR=@\"${DEVELOPER_BIN_DIR}\"'
   }
   s.libraries = 'c++'
   s.requires_arc = false

diff --git a/Cedar.xcodeproj/project.pbxproj b/Cedar.xcodeproj/project.pbxproj
diff --git a/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Failing Test Bundle.xcscheme b/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Failing Test Bundle.xcscheme
diff --git a/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar iOS SenTestingKit Tests.xcscheme b/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar iOS SenTestingKit Tests.xcscheme
diff --git a/OCUnitAppLogicTests/OCUnitAppLogicTests-Info.plist b/OCUnitAppLogicTests/OCUnitAppLogicTests-Info.plist
diff --git a/OCUnitAppLogicTests/OCUnitAppLogicTests-Prefix.pch b/OCUnitAppLogicTests/OCUnitAppLogicTests-Prefix.pch
diff --git a/OCUnitAppLogicTests/OCUnitAppLogicTests.mm b/OCUnitAppLogicTests/OCUnitAppLogicTests.mm
diff --git a/OCUnitAppLogicTests/OCUnitAppLogicTestsWithSenTestingKit.m b/OCUnitAppLogicTests/OCUnitAppLogicTestsWithSenTestingKit.m
diff --git a/OCUnitAppLogicTests/en.lproj/InfoPlist.strings b/OCUnitAppLogicTests/en.lproj/InfoPlist.strings
diff --git a/OCUnitAppTests/OCUnitApplicationTestsWithSenTestingKit.mm b/OCUnitAppTests/OCUnitApplicationTestsWithSenTestingKit.mm