diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 05:53:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-27 05:53:14 +0000 |
| commit | eb7a783c5acdd918466c39ef68720d9f3b288b4c (patch) | |
| tree | f8388a090300d9fc01c613bd17c6ed5f1ad2fa21 | |
| parent | b0e0d998d2f175a586e48b01d39761e4fceaf662 (diff) | |
| parent | ef40c71413dae00ac75f5d6de4c4d423880cfe6f (diff) | |
| download | protobuf-eb7a783c5acdd918466c39ef68720d9f3b288b4c.tar.gz | |
Merge "Snap for 7857989 from d9868039b40b1995f75c8d7ece9df29c7ab3f54d to androidx-fragment-release" into androidx-fragment-release
| -rw-r--r-- | cmake/libprotobuf.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index fd70da7e4..71fdb004f 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -126,6 +126,8 @@ if(MSVC AND protobuf_BUILD_SHARED_LIBS) PUBLIC PROTOBUF_USE_DLLS PRIVATE LIBPROTOBUF_EXPORTS) endif() +# Suppress inconsistent-missing-override warnings that are being ignored upstream +target_compile_options(libprotobuf PRIVATE -Wno-inconsistent-missing-override) set_target_properties(libprotobuf PROPERTIES VERSION ${protobuf_VERSION} OUTPUT_NAME ${LIB_PREFIX}protobuf |