diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index d56f4ed2bb25e9..90d12a6c453bf6 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -39,8 +39,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP libheif USE_LIBHEIF pybind11 USE_PYTHON - tools OIIO_BUILD_TOOLS - tools USE_QT + viewer USE_QT ) vcpkg_cmake_configure( @@ -49,6 +48,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DOIIO_BUILD_TESTS=OFF + -DOIIO_BUILD_TOOLS=ON -DUSE_DCMTK=OFF -DUSE_NUKE=OFF -DUSE_OpenVDB=OFF @@ -73,9 +73,14 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO) -if("tools" IN_LIST FEATURES) +vcpkg_copy_tools( + TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool + AUTO_CLEAN +) + +if("viewer" IN_LIST FEATURES) vcpkg_copy_tools( - TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool iv + TOOL_NAMES iv AUTO_CLEAN ) endif() diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index a2b67d66495bdd..6a551cb53ec0a8 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.4.14.0", - "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", @@ -103,8 +103,8 @@ "python3" ] }, - "tools": { - "description": "Build openimageio tools", + "viewer": { + "description": "Build openimageio viewer", "dependencies": [ "opengl", { diff --git a/versions/baseline.json b/versions/baseline.json index 4a68d6096fd065..27a10f1cd15f8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6170,7 +6170,7 @@ }, "openimageio": { "baseline": "2.4.14.0", - "port-version": 2 + "port-version": 3 }, "openjpeg": { "baseline": "2.5.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 49da4aa3b11724..201f4ecd7a7349 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f22b6f8b638d685c3ac8a1c473e6cc269d7b836", + "version": "2.4.14.0", + "port-version": 3 + }, { "git-tree": "fed3a9ba9a7731e30376ded1d6bdaba3e41b1ec6", "version": "2.4.14.0",