mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 12:26:08 +08:00
[opencv4] fix webp include dir (#31045)
This commit is contained in:
parent
b9ef89b775
commit
7dc921f3ea
@ -81,3 +81,16 @@
|
|||||||
if(NOT GDCM_FOUND)
|
if(NOT GDCM_FOUND)
|
||||||
set(HAVE_GDCM NO)
|
set(HAVE_GDCM NO)
|
||||||
ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
|
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()
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "opencv4",
|
"name": "opencv4",
|
||||||
"version": "4.7.0",
|
"version": "4.7.0",
|
||||||
"port-version": 5,
|
"port-version": 6,
|
||||||
"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",
|
||||||
|
@ -5806,7 +5806,7 @@
|
|||||||
},
|
},
|
||||||
"opencv4": {
|
"opencv4": {
|
||||||
"baseline": "4.7.0",
|
"baseline": "4.7.0",
|
||||||
"port-version": 5
|
"port-version": 6
|
||||||
},
|
},
|
||||||
"opendnp3": {
|
"opendnp3": {
|
||||||
"baseline": "3.1.1",
|
"baseline": "3.1.1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "d435a87c7a3f4dd38d623503d5200abe65c249d1",
|
||||||
|
"version": "4.7.0",
|
||||||
|
"port-version": 6
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717",
|
"git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717",
|
||||||
"version": "4.7.0",
|
"version": "4.7.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user