diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-09 13:53:20 -0400 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2016-06-13 13:55:00 -0700 |
commit | 72df8446975d018616a4ff97f1d79f55c6d21af8 (patch) | |
tree | 832b81f7f30d6915221b4087b265cfb4b61b4ad5 /Protobuf.podspec | |
parent | 1445ce2809511d2af2ef0f80685a16385c3fff71 (diff) | |
download | protobuf-72df8446975d018616a4ff97f1d79f55c6d21af8.tar.gz protobuf-72df8446975d018616a4ff97f1d79f55c6d21af8.tar.bz2 protobuf-72df8446975d018616a4ff97f1d79f55c6d21af8.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 'Protobuf.podspec')
-rw-r--r-- | Protobuf.podspec | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index 0bbd06df..d763f01d 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -10,6 +10,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/google/protobuf' s.license = 'New BSD' s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } + s.cocoapods_version = '>= 1.0' s.source = { :git => 'https://github.com/google/protobuf.git', :tag => "v#{s.version}" } @@ -32,7 +33,10 @@ Pod::Spec.new do |s| # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be # left out, as it's an umbrella implementation file. s.exclude_files = 'objectivec/GPBProtocolBuffers.m' - s.header_mappings_dir = 'objectivec' + + # Set a CPP symbol so the code knows to use framework imports. + s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } s.ios.deployment_target = '7.1' s.osx.deployment_target = '10.9' |