diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2018-12-13 11:44:01 +0100 |
|---|---|---|
| committer | Stefano Sinigardi <stesinigardi@hotmail.com> | 2018-12-13 11:44:01 +0100 |
| commit | 9b850a81497be8981a32e2c8f31c68a8dc94a696 (patch) | |
| tree | 5c247ecf9d73459f84d2b0cbc93ceb25cc9ff975 | |
| parent | e04b4ed5b5ff5c1b61e5ce3d70ac101ffe3237c4 (diff) | |
| download | vcpkg-9b850a81497be8981a32e2c8f31c68a8dc94a696.tar.gz vcpkg-9b850a81497be8981a32e2c8f31c68a8dc94a696.zip | |
[OpenCV3] fix protobuf patch
| -rw-r--r-- | ports/opencv/0005-remove-custom-protobuf-find-package.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ports/opencv/0005-remove-custom-protobuf-find-package.patch b/ports/opencv/0005-remove-custom-protobuf-find-package.patch index 2944810e5..91ac137f9 100644 --- a/ports/opencv/0005-remove-custom-protobuf-find-package.patch +++ b/ports/opencv/0005-remove-custom-protobuf-find-package.patch @@ -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() |