зеркало из https://github.com/microsoft/vcpkg.git
[openimageio] add libheif as an optional dependency, remove libsquish as a dependency (#29218)
* [openimageio] add libheif as an optional dependncy * fmt * x-add-version * optional libheif find_dependency * ./vcpkg x-add-version --all --overwrite-version * also remove libsquish from dep list * x-add-version
This commit is contained in:
Родитель
e5143067da
Коммит
b7c9204336
|
@ -2,13 +2,14 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
|
|||
index 0a6afeb..2a67ee3 100644
|
||||
--- a/src/cmake/Config.cmake.in
|
||||
+++ b/src/cmake/Config.cmake.in
|
||||
@@ -2,6 +2,22 @@
|
||||
@@ -2,6 +2,23 @@
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
|
||||
+find_dependency(libheif CONFIG)
|
||||
+if (@USE_LIBHEIF@)
|
||||
+ find_dependency(libheif CONFIG)
|
||||
+endif()
|
||||
+find_dependency(PNG)
|
||||
+find_dependency(unofficial-libsquish CONFIG)
|
||||
+if(@USE_OPENCV@)
|
||||
+ find_dependency(OpenCV CONFIG)
|
||||
+endif()
|
||||
|
|
|
@ -41,6 +41,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
opencv USE_OPENCV
|
||||
openjpeg USE_OPENJPEG
|
||||
webp USE_WEBP
|
||||
libheif USE_LIBHEIF
|
||||
pybind11 USE_PYTHON
|
||||
tools OIIO_BUILD_TOOLS
|
||||
tools USE_OPENGL
|
||||
|
@ -68,7 +69,7 @@ vcpkg_cmake_configure(
|
|||
-DINSTALL_DOCS=OFF
|
||||
-DENABLE_INSTALL_testtex=OFF
|
||||
"-DFMT_INCLUDES=${CURRENT_INSTALLED_DIR}/include"
|
||||
"-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap"
|
||||
"-DREQUIRED_DEPS=fmt;JPEG;PNG;Robinmap"
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
ENABLE_INSTALL_testtex
|
||||
)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "openimageio",
|
||||
"version": "2.4.5.0",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"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",
|
||||
|
@ -20,10 +20,8 @@
|
|||
"boost-thread",
|
||||
"boost-type-traits",
|
||||
"fmt",
|
||||
"libheif",
|
||||
"libjpeg-turbo",
|
||||
"libpng",
|
||||
"libsquish",
|
||||
"openexr",
|
||||
"robin-map",
|
||||
"tiff",
|
||||
|
@ -62,6 +60,12 @@
|
|||
"giflib"
|
||||
]
|
||||
},
|
||||
"libheif": {
|
||||
"description": "Enable heif support for openimageio",
|
||||
"dependencies": [
|
||||
"libheif"
|
||||
]
|
||||
},
|
||||
"libraw": {
|
||||
"description": "Enable RAW image files support",
|
||||
"dependencies": [
|
||||
|
|
|
@ -5622,7 +5622,7 @@
|
|||
},
|
||||
"openimageio": {
|
||||
"baseline": "2.4.5.0",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"openjpeg": {
|
||||
"baseline": "2.5.0",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3c8df049a8e7b1c3e48006e78c4f5a9d451860a0",
|
||||
"version": "2.4.5.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "d89c769d1b813eadd08173e4e9d18049ac8c1d23",
|
||||
"version": "2.4.5.0",
|
||||
|
|
Загрузка…
Ссылка в новой задаче