mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 13:43:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openimageio] Fix find openjpeg

Browse Source
This commit is contained in:
JackBoosY 2020-01-01 20:53:40 -08:00
parent 7400c26160
commit 8eda8b27f5
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ports/openimageio/fix-dependency.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
index 2f4f7ce..6419c79 100644 index 2f4f7ce..7275804 100644
--- a/src/cmake/externalpackages.cmake --- a/src/cmake/externalpackages.cmake
+++ b/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake
@@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED) @@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED)
@ -31,7 +31,12 @@ index 2f4f7ce..6419c79 100644
DEFINITIONS -DUSE_OPENCV=1) DEFINITIONS -DUSE_OPENCV=1)
# Intel TBB # Intel TBB
@@ -237,8 +244,12 @@ checked_find_package (OpenJpeg) @@ -233,12 +240,16 @@ checked_find_package (Field3D
checked_find_package (GIF 4)
checked_find_package (Libheif 1.3) # For HEIF/HEIC format
checked_find_package (LibRaw)
-checked_find_package (OpenJpeg)
+checked_find_package (OpenJPEG CONFIG)
checked_find_package (OpenVDB 5.0 checked_find_package (OpenVDB 5.0
DEPS TBB DEPS TBB
DEFINITIONS -DUSE_OPENVDB=1) DEFINITIONS -DUSE_OPENVDB=1)
@ -56,6 +61,19 @@ index 2f4f7ce..6419c79 100644
if (USE_QT AND NOT Qt5_FOUND AND APPLE) if (USE_QT AND NOT Qt5_FOUND AND APPLE)
message (STATUS " If you think you installed qt5 with Homebrew and it still doesn't work,") message (STATUS " If you think you installed qt5 with Homebrew and it still doesn't work,")
message (STATUS " try: export PATH=/usr/local/opt/qt5/bin:$PATH") message (STATUS " try: export PATH=/usr/local/opt/qt5/bin:$PATH")
diff --git a/src/jpeg2000.imageio/CMakeLists.txt b/src/jpeg2000.imageio/CMakeLists.txt
index 7bc6adb..0ac8937 100644
--- a/src/jpeg2000.imageio/CMakeLists.txt
+++ b/src/jpeg2000.imageio/CMakeLists.txt
@@ -3,7 +3,7 @@
# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
if (OPENJPEG_FOUND)
- if (${OPENJPEG_VERSION} VERSION_LESS 2.0)
+ if (0)
# Old OpenJpeg 1.5. Remove this eventually.
#
# For reasons I don't understand, OpenJPEG 1.5 fails imageinout_test
diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt
index 81a0ff5..23326a0 100644 index 81a0ff5..23326a0 100644
--- a/src/raw.imageio/CMakeLists.txt --- a/src/raw.imageio/CMakeLists.txt