diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2014-02-24 20:30:07 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2014-02-24 20:30:07 +0000 |
| commit | 47698affec42b20e572fc9bfbe6563e5b39391c3 (patch) | |
| tree | a9d66eff90a18724ace88daa2aad4eb9223213ef | |
| parent | c1d255be26ea580b559e9946eb48e2adfaa3db9b (diff) | |
More support for allowing GTM to compile with -Wundef.
DELTA=8 (8 added, 0 deleted, 0 changed)
| -rw-r--r-- | GTMDefines.h | 2 | ||||
| -rw-r--r-- | UnitTesting/GTMGoogleTestRunner.mm | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/GTMDefines.h b/GTMDefines.h index 1e6fa3f..14ffa7e 100644 --- a/GTMDefines.h +++ b/GTMDefines.h @@ -193,9 +193,11 @@ // For iPhone specific stuff #define GTM_IPHONE_SDK 1 #if TARGET_IPHONE_SIMULATOR + #define GTM_IPHONE_DEVICE 0 #define GTM_IPHONE_SIMULATOR 1 #else #define GTM_IPHONE_DEVICE 1 + #define GTM_IPHONE_SIMULATOR 0 #endif // TARGET_IPHONE_SIMULATOR // By default, GTM has provided it's own unittesting support, define this // to use the support provided by Xcode, especially for the Xcode4 support diff --git a/UnitTesting/GTMGoogleTestRunner.mm b/UnitTesting/GTMGoogleTestRunner.mm index 5bc1d5f..3151eb3 100644 --- a/UnitTesting/GTMGoogleTestRunner.mm +++ b/UnitTesting/GTMGoogleTestRunner.mm @@ -46,6 +46,12 @@ // - Write some C++ tests and add them to your test bundle sources. // - Build and run tests. Your C++ tests should just execute. +// If you are using this with XCTest (as opposed to SenTestingKit) +// make sure to define GTM_USING_XCTEST. +#ifndef GTM_USING_XCTEST +#define GTM_USING_XCTEST 0 +#endif + #if GTM_USING_XCTEST #import <XCTest/XCTest.h> #define SenTestCase XCTestCase |