[opencv4] Fix feature openexr compilation error (#42230)

This commit is contained in:
jim wang 2024-11-22 22:50:39 +00:00 committed by GitHub
parent b112a65db5
commit b171e5156a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6bc6de..61b7a02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -831,6 +831,9 @@ include(cmake/OpenCVFindLibsPerf.cmake)
include(cmake/OpenCVFindLAPACK.cmake)
include(cmake/OpenCVFindProtobuf.cmake)
include(cmake/OpenCVDetectFlatbuffers.cmake)
+if(WITH_OPENEXR)
+ include(cmake/OpenCVFindOpenEXR.cmake)
+endif()
if(WITH_TIMVX)
include(cmake/OpenCVFindTIMVX.cmake)
endif()

View File

@ -22,6 +22,7 @@ vcpkg_from_github(
0015-fix-freetype.patch 0015-fix-freetype.patch
0017-fix-flatbuffers.patch 0017-fix-flatbuffers.patch
0019-opencl-kernel.patch 0019-opencl-kernel.patch
0020-miss-openexr.patch
) )
# Disallow accidental build of vendored copies # Disallow accidental build of vendored copies
file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")

View File

@ -1,6 +1,7 @@
{ {
"name": "opencv4", "name": "opencv4",
"version": "4.10.0", "version": "4.10.0",
"port-version": 1,
"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",

View File

@ -6666,7 +6666,7 @@
}, },
"opencv4": { "opencv4": {
"baseline": "4.10.0", "baseline": "4.10.0",
"port-version": 0 "port-version": 1
}, },
"opendnp3": { "opendnp3": {
"baseline": "3.1.1", "baseline": "3.1.1",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "6ba67264448ce7a60b8e109db62270331e657e38",
"version": "4.10.0",
"port-version": 1
},
{ {
"git-tree": "89c7baedc6a4590a76c9a04cfe65b5a23c53800c", "git-tree": "89c7baedc6a4590a76c9a04cfe65b5a23c53800c",
"version": "4.10.0", "version": "4.10.0",