diff options
| author |  rsgowman <rgowman@google.com> | 2018-02-16 09:47:30 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-16 09:47:30 -0500 |
| commit | 7a97f6c2abf39752bb66a520d57bc6e9c11b269d (patch) | |
| tree | 1f2b91790187da1f97a5fcd3b5841d0d769c4991 /FirebaseFirestore.podspec | |
| parent | 81ee594e325a922a91557d82563132f22977c947 (diff) | |
Enable -Wcomma for our build; disable it for abseil. (#799)
In order to use different cflags for abseil, this patch splits it out
into a subspec within the pod.
The cmake side of things "just works" since Firestore/CMakeLists.txt
includes abseil before setting our compiler flags.
Diffstat (limited to 'FirebaseFirestore.podspec')
| -rw-r--r-- | FirebaseFirestore.podspec | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 84a89d1..25b476a 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -35,7 +35,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, 'Firestore/core/include/**/*.{h,cc,mm}', 'Firestore/core/src/**/*.{h,cc,mm}', 'Firestore/third_party/Immutable/*.[mh]', - 'Firestore/third_party/abseil-cpp/**/*.{h,cc}' ] s.requires_arc = [ 'Firestore/Source/**/*', @@ -45,7 +44,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.exclude_files = [ 'Firestore/Port/*test.cc', 'Firestore/third_party/Immutable/Tests/**', - 'Firestore/third_party/abseil-cpp/**/*_test.{h,cc}', # Exclude alternate implementations for other platforms 'Firestore/core/src/firebase/firestore/util/assert_stdio.cc', @@ -79,4 +77,19 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, Firestore/core/src/firebase/firestore/util/config.h.in > \ Firestore/core/src/firebase/firestore/util/config.h CMD + + s.subspec 'abseil-cpp' do |ss| + ss.preserve_path = [ + 'Firestore/third_party/abseil-cpp/absl' + ] + ss.source_files = [ + 'Firestore/third_party/abseil-cpp/**/*.cc' + ] + ss.exclude_files = [ + 'Firestore/third_party/abseil-cpp/**/*_test.cc', + ] + + ss.library = 'c++' + ss.compiler_flags = '$(inherited) ' + '-Wno-comma' + end end |