Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[opencv4,opencv3] Control exported protobuf dependency (#20550) 

* Control exported protobuf dependency

* Update versions

* Control exported protobuf dependency

* Update versions
This commit is contained in:
Kai Pastor 2021-10-07 01:58:41 +02:00 committed by GitHub
parent 5033b3e2e8
commit 15af003194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/opencv3/portfile.cmake
View File

@ -353,8 +353,8 @@ vcpkg_copy_pdbs()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES)
set(DEPS_STRING "include(CMakeFindDependencyMacro)
find_dependency(Protobuf CONFIG)
if(protobuf_FOUND)
if(${BUILD_opencv_flann})
find_dependency(Protobuf CONFIG REQUIRED)
if(TARGET protobuf::libprotobuf)
add_library (libprotobuf INTERFACE IMPORTED)
set_target_properties(libprotobuf PROPERTIES

2
ports/opencv3/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.15",
"port-version": 2,
"port-version": 3,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"dependencies": [

4
ports/opencv4/portfile.cmake
View File

@ -413,8 +413,8 @@ vcpkg_copy_pdbs()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES)
set(DEPS_STRING "include(CMakeFindDependencyMacro)
find_dependency(Protobuf CONFIG)
if(protobuf_FOUND)
if(${BUILD_opencv_dnn})
find_dependency(Protobuf CONFIG REQUIRED)
if(TARGET protobuf::libprotobuf)
add_library (libprotobuf INTERFACE IMPORTED)
set_target_properties(libprotobuf PROPERTIES

2
ports/opencv4/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.5.3",
"port-version": 2,
"port-version": 3,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"dependencies": [

4
versions/baseline.json
View File

@ -4818,11 +4818,11 @@
},
"opencv3": {
"baseline": "3.4.15",
"port-version": 2
"port-version": 3
},
"opencv4": {
"baseline": "4.5.3",
"port-version": 2
"port-version": 3
},
"opendnp3": {
"baseline": "3.1.0",

5
versions/o-/opencv3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5",
"version": "3.4.15",
"port-version": 3
},
{
"git-tree": "27a6a94907d72955e9d473dfbce89ae851ee1bda",
"version": "3.4.15",

5
versions/o-/opencv4.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d48f3aabd1d417854360efb92874f3b533f83966",
"version": "4.5.3",
"port-version": 3
},
{
"git-tree": "6b5539ab3cd468944f8d46698c610285319bf0f7",
"version": "4.5.3",