diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2020-12-01 02:08:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 10:08:38 -0800 |
| commit | ad2933e97e7f6d2e2bece2a7a372be7a6833f28c (patch) | |
| tree | 51be708747b31f9978b5c00bbfd7ac4fa0241d04 /ports/protobuf/fix-android-log.patch | |
| parent | 3fd77452e0629db5a0f672b646368552a85ccce2 (diff) | |
| download | vcpkg-ad2933e97e7f6d2e2bece2a7a372be7a6833f28c.tar.gz vcpkg-ad2933e97e7f6d2e2bece2a7a372be7a6833f28c.zip | |
[protobuf] Update to 3.14.0 (#14670)
* [protobuf] Update to 3.14.0
* Replace patch CRLF with LF
Diffstat (limited to 'ports/protobuf/fix-android-log.patch')
| -rw-r--r-- | ports/protobuf/fix-android-log.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/ports/protobuf/fix-android-log.patch b/ports/protobuf/fix-android-log.patch deleted file mode 100644 index 47a935078..000000000 --- a/ports/protobuf/fix-android-log.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake -index 6bf86a277..424854798 100644 ---- a/cmake/libprotobuf-lite.cmake -+++ b/cmake/libprotobuf-lite.cmake -@@ -67,6 +67,9 @@ target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT}) - if(protobuf_LINK_LIBATOMIC) - target_link_libraries(libprotobuf-lite atomic) - endif() -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") -+ target_link_libraries(libprotobuf-lite log) -+endif() - target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src) - if(MSVC AND protobuf_BUILD_SHARED_LIBS) - target_compile_definitions(libprotobuf-lite -diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index 0c12596c2..a5be494fb 100644 ---- a/cmake/libprotobuf.cmake -+++ b/cmake/libprotobuf.cmake -@@ -121,6 +121,9 @@ endif() - if(protobuf_LINK_LIBATOMIC) - target_link_libraries(libprotobuf atomic) - endif() -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") -+ target_link_libraries(libprotobuf log) -+endif() - target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src) - if(MSVC AND protobuf_BUILD_SHARED_LIBS) - target_compile_definitions(libprotobuf |