[opencv] turn openvino dependency as optional feature (#34889)

* [opencv] turn openvino dependency as optional feature

* updated version database
This commit is contained in:
Ilya Lavrenov 2023-11-07 00:31:44 +04:00 committed by GitHub
parent 1802d39436
commit 8320c3855b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 10 deletions

View File

@ -71,6 +71,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"jpeg" WITH_JPEG
"lapack" WITH_LAPACK
"nonfree" OPENCV_ENABLE_NONFREE
"openvino" WITH_OPENVINO
"openexr" WITH_OPENEXR
"opengl" WITH_OPENGL
"ovis" CMAKE_REQUIRE_FIND_PACKAGE_OGRE
@ -86,13 +87,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb"
set(BUILD_opencv_dnn OFF)
set(WITH_OPENVINO OFF)
if("dnn" IN_LIST FEATURES)
if(NOT VCPKG_TARGET_IS_ANDROID)
set(BUILD_opencv_dnn ON)
if(NOT VCPKG_TARGET_IS_UWP)
set(WITH_OPENVINO ON)
endif()
else()
message(WARNING "The dnn module cannot be enabled on Android")
endif()

View File

@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.8.0",
"port-version": 8,
"port-version": 9,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
@ -109,10 +109,6 @@
"host": true,
"default-features": false
},
{
"name": "openvino",
"platform": "!uwp"
},
"protobuf"
]
},
@ -247,6 +243,37 @@
"openmp": {
"description": "Enable openmp support for opencv"
},
"openvino": {
"description": "OpenVINO support for OpenCV DNN",
"supports": "!uwp",
"dependencies": [
{
"name": "opencv4",
"default-features": false,
"features": [
"dnn"
]
},
{
"name": "openvino",
"default-features": false,
"features": [
"auto",
"cpu",
"hetero"
],
"platform": "!uwp"
},
{
"name": "openvino",
"default-features": false,
"features": [
"gpu"
],
"platform": "x64 & !(osx | uwp) & !static"
}
]
},
"ovis": {
"description": "opencv_ovis module",
"dependencies": [

View File

@ -6198,7 +6198,7 @@
},
"opencv4": {
"baseline": "4.8.0",
"port-version": 8
"port-version": 9
},
"opendnp3": {
"baseline": "3.1.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7ed8c48a9b2be5df262ccbcfa876f5314f429c10",
"version": "4.8.0",
"port-version": 9
},
{
"git-tree": "48c97b54fceaef9a96d374693f47e3ea91383f3c",
"version": "4.8.0",