mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19049 from alalek:issue_17282

Browse Source
This commit is contained in:
Alexander Alekhin 2020-12-11 19:06:47 +00:00
commit f9f9e2ad4a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/protobuf/CMakeLists.txt vendored
View File

@ -153,6 +153,11 @@ set_target_properties(libprotobuf
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
)
if(ANDROID)
# https://github.com/opencv/opencv/issues/17282
target_link_libraries(libprotobuf INTERFACE "-landroid" "-llog")
endif()
get_protobuf_version(Protobuf_VERSION "${PROTOBUF_ROOT}/src")
set(Protobuf_VERSION ${Protobuf_VERSION} CACHE INTERNAL "" FORCE)