diff options
author | Rich Gowman <rgowman@google.com> | 2018-06-12 10:27:17 -0400 |
---|---|---|
committer | Rich Gowman <rgowman@google.com> | 2018-06-12 10:27:17 -0400 |
commit | cf2899a085f7ceca3fad2d1fb5336be25cecd7ff (patch) | |
tree | 38c835a29fcda279c8dd220781d2b5c726da307f /Firestore/core/include/firebase/firestore/CMakeLists.txt | |
parent | 1597765af8c897ab73d21d6d404f8eeede7890b1 (diff) | |
parent | 9307f4893008f7d6cf9473e906d4c896546c5c8c (diff) |
Merge remote-tracking branch 'origin/master' into rsgowman/protobuf_cpp
Also "fixed" BadFieldValueTagWithOtherValidTagsPresent test by changing
'false' to 'true'. Details: Depending on the version of nanopb, nanopb
would explicitly encode 'false', which shouldn't be done in proto3. When
it's explicitly encoded, the test worked properly. But when it was
(properly) dropped, the invalid tag is the only field that's actually
encoded, thus violating the assumptions of the test, leading to a test
failure. s/false/true fixes it, as now the boolean_value field is
(properly) encoded regardless of version.
Diffstat (limited to 'Firestore/core/include/firebase/firestore/CMakeLists.txt')
-rw-r--r-- | Firestore/core/include/firebase/firestore/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Firestore/core/include/firebase/firestore/CMakeLists.txt b/Firestore/core/include/firebase/firestore/CMakeLists.txt index e4e7acd..0c7fd48 100644 --- a/Firestore/core/include/firebase/firestore/CMakeLists.txt +++ b/Firestore/core/include/firebase/firestore/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Hack to make the headers show up in IDEs +# Workaround to make the headers show up in IDEs # (see https://stackoverflow.com/questions/27039019/ and open issue on CMake # issue tracker: https://gitlab.kitware.com/cmake/cmake/issues/15234) add_custom_target(firebase_firestore_types_ide SOURCES |