2
0

ndk-link-log.diff 1.1 KB

12345678910111213141516171819202122232425262728
  1. diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
  2. index 6bf86a2..7aa4647 100644
  3. --- a/cmake/libprotobuf-lite.cmake
  4. +++ b/cmake/libprotobuf-lite.cmake
  5. @@ -67,6 +67,9 @@ target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT})
  6. if(protobuf_LINK_LIBATOMIC)
  7. target_link_libraries(libprotobuf-lite atomic)
  8. endif()
  9. +if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
  10. + target_link_libraries(libprotobuf-lite log)
  11. +endif()
  12. target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src)
  13. if(MSVC AND protobuf_BUILD_SHARED_LIBS)
  14. target_compile_definitions(libprotobuf-lite
  15. diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
  16. index 0c12596..294ce59 100644
  17. --- a/cmake/libprotobuf.cmake
  18. +++ b/cmake/libprotobuf.cmake
  19. @@ -121,6 +121,9 @@ endif()
  20. if(protobuf_LINK_LIBATOMIC)
  21. target_link_libraries(libprotobuf atomic)
  22. endif()
  23. +if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
  24. + target_link_libraries(libprotobuf log)
  25. +endif()
  26. target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src)
  27. if(MSVC AND protobuf_BUILD_SHARED_LIBS)
  28. target_compile_definitions(libprotobuf