mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[OpenCV] Disable quality module on iOS to avoid find_package error (#27287)

Browse Source 
* [opencv][ios] disable quality on iOS to avoid a configuration error

* ./vcpkg x-add-version --all
This commit is contained in:
Russell Greene 2022-10-18 20:29:19 -05:00 committed by GitHub
parent 58f487407a
commit 3fb6971261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/opencv4/portfile.cmake
View File

@ -159,11 +159,11 @@ endif()
# Build image quality module when building with 'contrib' feature and not UWP.
set(BUILD_opencv_quality OFF)
if("contrib" IN_LIST FEATURES)
if (VCPKG_TARGET_IS_UWP)
if (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS)
set(BUILD_opencv_quality OFF)
message(WARNING "The image quality module (quality) does not build for UWP, the module has been disabled.")
message(WARNING "The image quality module (quality) does not build for UWP or iOS, the module has been disabled.")
# The hdf module is silently disabled by OpenCVs buildsystem if HDF5 is not detected.
message(WARNING "The hierarchical data format module (hdf) depends on HDF5 which doesn't support UWP, the module has been disabled.")
message(WARNING "The hierarchical data format module (hdf) depends on HDF5 which doesn't support UWP or iOS, the module has been disabled.")
else()
set(BUILD_opencv_quality CMAKE_DEPENDS_IN_PROJECT_ONLY)
endif()

4
ports/opencv4/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.6.0",
"port-version": 5,
"port-version": 6,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
@ -39,7 +39,7 @@
},
{
"name": "tesseract",
"platform": "!uwp & !(windows & (arm | arm64))"
"platform": "!uwp & !(windows & (arm | arm64)) & !ios"
}
]
},

2
versions/baseline.json
View File

@ -5402,7 +5402,7 @@
},
"opencv4": {
"baseline": "4.6.0",
"port-version": 5
"port-version": 6
},
"opendnp3": {
"baseline": "3.1.1",

5
versions/o-/opencv4.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9961bbcc88c934054f6137f3417bbd9cccf478d4",
"version": "4.6.0",
"port-version": 6
},
{
"git-tree": "fdfecadf1577e25595f58dbe2d6c26bd2cb99296",
"version": "4.6.0",