aboutsummaryrefslogtreecommitdiff
path: root/objectivec/GPBWellKnownTypes.h
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2016-05-09 13:53:20 -0400
committerThomas Van Lenten <thomasvl@google.com>2016-05-24 09:25:02 -0400
commit7da023b892ccd7135b6c9762d7618ccf414a4cd7 (patch)
tree04eb21f4a5a59ce61be4dc974d2e7cd6857f296a /objectivec/GPBWellKnownTypes.h
parent2131b2d544bf6eeb789c128ef3e9e04fc299237a (diff)
downloadprotobuf-7da023b892ccd7135b6c9762d7618ccf414a4cd7.tar.gz
protobuf-7da023b892ccd7135b6c9762d7618ccf414a4cd7.tar.bz2
protobuf-7da023b892ccd7135b6c9762d7618ccf414a4cd7.zip
Better support for using the proto library from a framework.
- Add generator constant for the default framework name. - Add generator api for making the CPP symbol from the name. - Add generator api to see if it is a bundled proto file. - Output a CPP conditional and two imports for the core library headers. - Add helper for generating the #import for file headers to deal with the framework imports. - Add a reference from the unittests to a WKT to use that to inspect how imports generate. - Update the podspec to define the CPP symbol and require pods 1.0 (or later). Fixes https://github.com/google/protobuf/issues/1457
Diffstat (limited to 'objectivec/GPBWellKnownTypes.h')
-rw-r--r--objectivec/GPBWellKnownTypes.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/objectivec/GPBWellKnownTypes.h b/objectivec/GPBWellKnownTypes.h
index 28442fbe..311ac58e 100644
--- a/objectivec/GPBWellKnownTypes.h
+++ b/objectivec/GPBWellKnownTypes.h
@@ -30,8 +30,19 @@
#import <Foundation/Foundation.h>
-#import "google/protobuf/Duration.pbobjc.h"
-#import "google/protobuf/Timestamp.pbobjc.h"
+// This CPP symbol can be defined to use imports that match up to the framework
+// imports needed when using CocoaPods.
+#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
+ #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
+#endif
+
+#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
+ #import <Protobuf/Duration.pbobjc.h>
+ #import <Protobuf/Timestamp.pbobjc.h>
+#else
+ #import "google/protobuf/Duration.pbobjc.h"
+ #import "google/protobuf/Timestamp.pbobjc.h"
+#endif
NS_ASSUME_NONNULL_BEGIN