diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-24 18:50:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-24 18:50:15 +0000 |
| commit | 5ad3e8c7d56e997da63ad392c237b2a811530291 (patch) | |
| tree | f8388a090300d9fc01c613bd17c6ed5f1ad2fa21 | |
| parent | b0e0d998d2f175a586e48b01d39761e4fceaf662 (diff) | |
| parent | 3e55913777fea1ddbd91c47af93bc55cf210691b (diff) | |
| download | protobuf-5ad3e8c7d56e997da63ad392c237b2a811530291.tar.gz | |
Merge "Snap for 7233361 from 2ad4efceff02cc7b518a2f9d47ad07a435daad9f to androidx-paging-release" into androidx-paging-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 |