3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[opencv4] fix webp include dir (#31045)

Browse Source
This commit is contained in:
autoantwort 2023-04-25 00:46:08 +02:00 committed by GitHub
parent b9ef89b775
commit 7dc921f3ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/opencv4/0003-force-package-requirements.patch
View File

@ -81,3 +81,16 @@
if(NOT GDCM_FOUND)
set(HAVE_GDCM NO)
ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
index 213667a..4052387 100644
--- a/modules/imgcodecs/CMakeLists.txt
+++ b/modules/imgcodecs/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
if(HAVE_WEBP)
add_definitions(-DHAVE_WEBP)
- ocv_include_directories(${WEBP_INCLUDE_DIR})
+ ocv_include_directories(${WEBP_INCLUDE_DIRS})
list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})
endif()

2
ports/opencv4/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.7.0",
"port-version": 5,
"port-version": 6,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",

2
versions/baseline.json
View File

@ -5806,7 +5806,7 @@
},
"opencv4": {
"baseline": "4.7.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": "d435a87c7a3f4dd38d623503d5200abe65c249d1",
"version": "4.7.0",
"port-version": 6
},
{
"git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717",
"version": "4.7.0",