diff options
author | Gil <mcg@google.com> | 2018-06-01 13:42:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-01 13:42:47 -0700 |
commit | bb546e19885ae084823e0315e93564a44c0a8257 (patch) | |
tree | d755ae6087bae52da506fd7f9c5570d182ee85d5 /Firestore/core/test/firebase/firestore/util/CMakeLists.txt | |
parent | 8b703e3b04f9b3784a93fe3fa579a1d8f07e981e (diff) |
Fix Firestore compilation under Xcode < 9.2 (#1367)
* Don't rely on specialization failure to determine when std::hash is unavailable.
Instead manually declare the conditions under which std::hash should be
defined.
* Fix detection of Objective-C classes in Xcode < 9.2
std::is_base_of<NSObject, NSString>{} is false there so the overloads
defined for Objective-C types weren't getting enabled.
* Add explicit tests for StringFormat using Objective-C objects
* Add explicit tests for HasStdHash
Diffstat (limited to 'Firestore/core/test/firebase/firestore/util/CMakeLists.txt')
-rw-r--r-- | Firestore/core/test/firebase/firestore/util/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt index bcb1c84..c07a4ea 100644 --- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt @@ -137,3 +137,12 @@ cc_test( firebase_firestore_util gmock ) + +if(APPLE) + target_sources( + firebase_firestore_util_test + PUBLIC + string_format_apple_test.mm + type_traits_apple_test.mm + ) +endif() |