[openimageio] Fix openjpeg linkage (#23812)

This commit is contained in:
Mengna Li 2022-03-30 08:21:57 +08:00 committed by GitHub
parent 08226406cc
commit 7f8d160617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
index 1fc2059..62c4efb 100644
--- a/src/cmake/externalpackages.cmake
+++ b/src/cmake/externalpackages.cmake
@@ -222,7 +222,7 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER
# set (LIBRAW_FOUND 0)
endif ()
-checked_find_package (OpenJPEG VERSION_MIN 2.0)
+checked_find_package (OpenJPEG PREFER_CONFIG VERSION_MIN 2.0)
checked_find_package (OpenVDB
VERSION_MIN 5.0

View File

@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
fix-dependencies.patch
fix-config-cmake.patch
fix-openjpeg-linkage.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/ext")

View File

@ -1,9 +1,10 @@
{
"name": "openimageio",
"version": "2.3.10.1",
"port-version": 2,
"port-version": 3,
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
"homepage": "https://github.com/OpenImageIO/oiio",
"license": "BSD-3-Clause",
"dependencies": [
"boost-algorithm",
"boost-asio",

View File

@ -5094,7 +5094,7 @@
},
"openimageio": {
"baseline": "2.3.10.1",
"port-version": 2
"port-version": 3
},
"openjpeg": {
"baseline": "2.4.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca",
"version": "2.3.10.1",
"port-version": 3
},
{
"git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459",
"version": "2.3.10.1",