mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 18:13:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[OpenCV3] fix protobuf patch

Browse Source
This commit is contained in:
Stefano Sinigardi 2018-12-13 11:44:01 +01:00
parent e04b4ed5b5
commit 9b850a8149
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/opencv/0005-remove-custom-protobuf-find-package.patch
View File

@ -1,11 +1,14 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -633,7 +633,7 @@ include(cmake/OpenCVFindLibsGUI.cmake)
@@ -633,7 +633,10 @@ include(cmake/OpenCVFindLibsGUI.cmake)
include(cmake/OpenCVFindLibsVideo.cmake)
include(cmake/OpenCVFindLibsPerf.cmake)
include(cmake/OpenCVFindLAPACK.cmake)
-include(cmake/OpenCVFindProtobuf.cmake)
+find_package(protobuf)
+if(Protobuf_LIBRARIES)
+ set(HAVE_PROTOBUF TRUE)
+endif()
# ----------------------------------------------------------------------------
# Detect other 3rd-party libraries/tools
@ -16,7 +19,7 @@
set(include_dirs ${fw_inc})
set(sources_options "")
-set(libs libprotobuf ${LAPACK_LIBRARIES})
+set(libs protobuf ${LAPACK_LIBRARIES})
+set(libs protobuf::libprotobuf ${LAPACK_LIBRARIES})
if(OPENCV_DNN_OPENCL AND HAVE_OPENCL)
list(APPEND include_dirs ${OPENCL_INCLUDE_DIRS})
else()