[openimageio] do not install deprecated FindOpenImageIO (#21162)

* [openimageio] do not install deprecated FindOpenImageIO OpenImageIO provides cmake Config/Target files, so there is no more need for a FindOpenImageIO.cmake. This hides openimageio modules like OpenImageIO_Util. * Remove wrapper Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
microsoft · Dec 29, 2021 · 5d44acb · 5d44acb
1 parent df62d5c
commit 5d44acb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
@@ -48,7 +48,7 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DOIIO_BUILD_TESTS=OFF
@@ -83,10 +83,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc"
                     "${CURRENT_PACKAGES_DIR}/debug/include"
                     "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO")
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_fixup_pkgconfig()
 
-# Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
diff --git a/ports/openimageio/vcpkg-cmake-wrapper.cmake b/ports/openimageio/vcpkg-cmake-wrapper.cmake
diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openimageio",
   "version": "2.3.7.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4998,7 +4998,7 @@
     },
     "openimageio": {
       "baseline": "2.3.7.2",
-      "port-version": 4
+      "port-version": 5
     },
     "openjpeg": {
       "baseline": "2.4.0",

diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f9b44bac4dcc0735f5efc3e8f0d439790b7efbd0",
+      "version": "2.3.7.2",
+      "port-version": 5
+    },
     {
       "git-tree": "8b1ce552e00d88857ad35695435b353caf9ad4c2",
       "version": "2.3.7.2",