diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2021-03-05 17:17:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 17:17:40 +0000 |
| commit | 8108e70cc2a37a6639c982cd0b0f9467f615002c (patch) | |
| tree | f8388a090300d9fc01c613bd17c6ed5f1ad2fa21 | |
| parent | 63c2232d80ffad3b6298f401d3004c45bdc2d9a8 (diff) | |
| parent | 2ad4efceff02cc7b518a2f9d47ad07a435daad9f (diff) | |
| download | protobuf-8108e70cc2a37a6639c982cd0b0f9467f615002c.tar.gz | |
Merge "Suppress inconsistent-missing-override warnings in libprotobuf in cmake" into androidx-main am: 2ad4efceffandroidx-platform-dev-temp
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1619828
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71cd4f93bb1b8ed9c2098d10f5cdf7915b61ea66
| -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 |