diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-20 14:56:52 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-20 14:56:52 -0800 |
| commit | 93ac00106ecc7409dab32366758c75baa9c9bb6a (patch) | |
| tree | 4681a5fd088ab04ce6fb11a1334e163576d698a7 /ports/opencv | |
| parent | f64362201923a20111ced9b789286437a8acac13 (diff) | |
| parent | 99b06bba5d86a6982f2491d9f4ea7ef637ff3747 (diff) | |
| download | vcpkg-93ac00106ecc7409dab32366758c75baa9c9bb6a.tar.gz vcpkg-93ac00106ecc7409dab32366758c75baa9c9bb6a.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4994
Diffstat (limited to 'ports/opencv')
| -rw-r--r-- | ports/opencv/0005-remove-custom-protobuf-find-package.patch | 7 | ||||
| -rw-r--r-- | ports/opencv/CONTROL | 2 |
2 files changed, 6 insertions, 3 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() diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 5f012d80e..41e73b195 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -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 |