mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 21:17:59 +08:00
[opencv] turn openvino dependency as optional feature (#34889)
* [opencv] turn openvino dependency as optional feature * updated version database
This commit is contained in:
parent
1802d39436
commit
8320c3855b
@ -71,6 +71,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||||||
"jpeg" WITH_JPEG
|
"jpeg" WITH_JPEG
|
||||||
"lapack" WITH_LAPACK
|
"lapack" WITH_LAPACK
|
||||||
"nonfree" OPENCV_ENABLE_NONFREE
|
"nonfree" OPENCV_ENABLE_NONFREE
|
||||||
|
"openvino" WITH_OPENVINO
|
||||||
"openexr" WITH_OPENEXR
|
"openexr" WITH_OPENEXR
|
||||||
"opengl" WITH_OPENGL
|
"opengl" WITH_OPENGL
|
||||||
"ovis" CMAKE_REQUIRE_FIND_PACKAGE_OGRE
|
"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"
|
# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb"
|
||||||
set(BUILD_opencv_dnn OFF)
|
set(BUILD_opencv_dnn OFF)
|
||||||
set(WITH_OPENVINO OFF)
|
|
||||||
if("dnn" IN_LIST FEATURES)
|
if("dnn" IN_LIST FEATURES)
|
||||||
if(NOT VCPKG_TARGET_IS_ANDROID)
|
if(NOT VCPKG_TARGET_IS_ANDROID)
|
||||||
set(BUILD_opencv_dnn ON)
|
set(BUILD_opencv_dnn ON)
|
||||||
if(NOT VCPKG_TARGET_IS_UWP)
|
|
||||||
set(WITH_OPENVINO ON)
|
|
||||||
endif()
|
|
||||||
else()
|
else()
|
||||||
message(WARNING "The dnn module cannot be enabled on Android")
|
message(WARNING "The dnn module cannot be enabled on Android")
|
||||||
endif()
|
endif()
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "opencv4",
|
"name": "opencv4",
|
||||||
"version": "4.8.0",
|
"version": "4.8.0",
|
||||||
"port-version": 8,
|
"port-version": 9,
|
||||||
"description": "computer vision library",
|
"description": "computer vision library",
|
||||||
"homepage": "https://github.com/opencv/opencv",
|
"homepage": "https://github.com/opencv/opencv",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
@ -109,10 +109,6 @@
|
|||||||
"host": true,
|
"host": true,
|
||||||
"default-features": false
|
"default-features": false
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "openvino",
|
|
||||||
"platform": "!uwp"
|
|
||||||
},
|
|
||||||
"protobuf"
|
"protobuf"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -247,6 +243,37 @@
|
|||||||
"openmp": {
|
"openmp": {
|
||||||
"description": "Enable openmp support for opencv"
|
"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": {
|
"ovis": {
|
||||||
"description": "opencv_ovis module",
|
"description": "opencv_ovis module",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -6198,7 +6198,7 @@
|
|||||||
},
|
},
|
||||||
"opencv4": {
|
"opencv4": {
|
||||||
"baseline": "4.8.0",
|
"baseline": "4.8.0",
|
||||||
"port-version": 8
|
"port-version": 9
|
||||||
},
|
},
|
||||||
"opendnp3": {
|
"opendnp3": {
|
||||||
"baseline": "3.1.1",
|
"baseline": "3.1.1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "7ed8c48a9b2be5df262ccbcfa876f5314f429c10",
|
||||||
|
"version": "4.8.0",
|
||||||
|
"port-version": 9
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "48c97b54fceaef9a96d374693f47e3ea91383f3c",
|
"git-tree": "48c97b54fceaef9a96d374693f47e3ea91383f3c",
|
||||||
"version": "4.8.0",
|
"version": "4.8.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user