Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorPhil Nash2011-04-26 19:00:25 +0100
committerPhil Nash2011-04-26 19:00:25 +0100
commit95419e935cd57f0737ea2b30bb5793c5940a7abc (patch)
treeee2bd418280b9ff806b12ca4af729cd2553536f8 /projects
parent38edb9fa956aa1a62916bf19af5ed9ecb01b28bc (diff)
downloadcatch3-95419e935cd57f0737ea2b30bb5793c5940a7abc.tar.gz
Merges objc top level headers into main headers (using #ifdef __OBJC__)
Diffstat (limited to 'projects')
-rw-r--r--projects/XCode/OCTest/CatchOCTestCase.h2
-rw-r--r--projects/XCode/OCTest/Main.mm2
-rw-r--r--projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj10
3 files changed, 8 insertions, 6 deletions
diff --git a/projects/XCode/OCTest/CatchOCTestCase.h b/projects/XCode/OCTest/CatchOCTestCase.h
index aaa909e3..823f97aa 100644
--- a/projects/XCode/OCTest/CatchOCTestCase.h
+++ b/projects/XCode/OCTest/CatchOCTestCase.h
@@ -8,7 +8,7 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include "catch_objc.hpp"
+#include "catch.hpp"
#import <Cocoa/Cocoa.h>
#import "TestObj.h"
diff --git a/projects/XCode/OCTest/Main.mm b/projects/XCode/OCTest/Main.mm
index c303e310..e74b71dc 100644
--- a/projects/XCode/OCTest/Main.mm
+++ b/projects/XCode/OCTest/Main.mm
@@ -1 +1 @@
-#import "catch_objc_main.hpp"
+#import "catch_with_main.hpp"
diff --git a/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj b/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj
index 02ab295b..cdee764b 100644
--- a/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj
+++ b/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj
@@ -37,8 +37,9 @@
4A5953B6128E95D6009DC1B9 /* OCTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OCTest.mm; sourceTree = "<group>"; };
4A5953EF128E9A61009DC1B9 /* CatchOCTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CatchOCTestCase.h; sourceTree = "<group>"; };
4A5953F0128E9A61009DC1B9 /* CatchOCTestCase.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CatchOCTestCase.mm; sourceTree = "<group>"; };
- 4ADB5B8913655AA4001EB00B /* catch_objc_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_objc_main.hpp; path = ../../../include/catch_objc_main.hpp; sourceTree = SOURCE_ROOT; };
- 4ADB5B8A13655AA4001EB00B /* catch_objc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_objc.hpp; path = ../../../include/catch_objc.hpp; sourceTree = SOURCE_ROOT; };
+ 4A97DB2813673E3100C8087C /* catch_objc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_objc.hpp; path = ../../../include/internal/catch_objc.hpp; sourceTree = SOURCE_ROOT; };
+ 4A97DB2B13673E4700C8087C /* catch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch.hpp; path = ../../../include/catch.hpp; sourceTree = SOURCE_ROOT; };
+ 4A97DB3613673EA300C8087C /* catch_with_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_with_main.hpp; path = ../../../include/catch_with_main.hpp; sourceTree = SOURCE_ROOT; };
8DD76FA10486AA7600D96B5E /* OCTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = OCTest; sourceTree = BUILT_PRODUCTS_DIR; };
C6859EA3029092ED04C91782 /* OCTest.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = OCTest.1; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -69,8 +70,6 @@
08FB7795FE84155DC02AAC07 /* Source */ = {
isa = PBXGroup;
children = (
- 4ADB5B8913655AA4001EB00B /* catch_objc_main.hpp */,
- 4ADB5B8A13655AA4001EB00B /* catch_objc.hpp */,
4AFDF58212CA9E2800F15202 /* Catch */,
32A70AAB03705E1F00C91783 /* OCTest_Prefix.pch */,
08FB7796FE84155DC02AAC07 /* Main.mm */,
@@ -102,6 +101,9 @@
4AFDF58212CA9E2800F15202 /* Catch */ = {
isa = PBXGroup;
children = (
+ 4A97DB3613673EA300C8087C /* catch_with_main.hpp */,
+ 4A97DB2B13673E4700C8087C /* catch.hpp */,
+ 4A97DB2813673E3100C8087C /* catch_objc.hpp */,
);
name = Catch;
sourceTree = "<group>";