3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-31 05:03:22 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4963 from cenit/dev/cenit/fix_protobuf_ocv3_again

Browse Source 
[OpenCV3] fix protobuf patch, again
This commit is contained in:
Phil Christensen 2018-12-19 15:59:50 -08:00 committed by GitHub
commit 1682549034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 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()

2
ports/opencv/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencv
Version: 3.4.3-4
Version: 3.4.3-5
Build-Depends: zlib
Description: computer vision library
Default-Features: opengl, jpeg, png, tiff, eigen, flann