[openimageio] Change feature name python to pybind11, add vcpkg_copy_…

…tool_dependencies
andrm · Jan 20, 2020 · e97271e · e97271e
1 parent 2ae9ee4
commit e97271e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
@@ -40,9 +40,9 @@ Feature: webp
 Build-Depends: libwebp
 Description: Enable libwebp support for openimageio
 
-Feature: python
+Feature: pybind11
 Build-Depends: pybind11
-Description: Enable pybind11 support for openimageio
+Description: Enable Python bindings support for openimageio
 
 Feature: tools
 Description: Build openimageio tools
diff --git a/ports/openimageio/fix-tools-path.patch b/ports/openimageio/fix-tools-path.patch
@@ -7,7 +7,7 @@ index 9e54f67..d9c9437 100644
          endif ()
          set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools")
 -        install_targets (${_target_NAME})
-+        install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools)
++        install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools/openimageio)
      else ()
          message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}")
      endif ()
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
@@ -28,17 +28,17 @@ else()
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    libraw USE_LIBRAW
+    libraw      USE_LIBRAW
     opencolorio USE_OCIO
-    ffmpeg USE_FFMPEG
-    field3d USE_FIELD3D
-    freetype USE_FREETYPE
-    gif USE_GIF
-    opencv USE_OPENCV
-    openjpeg USE_OPENJPEG
-    webp USE_WEBP
-    python USE_PYTHON
-    tools OIIO_BUILD_TOOLS
+    ffmpeg      USE_FFMPEG
+    field3d     USE_FIELD3D
+    freetype    USE_FREETYPE
+    gif         USE_GIF
+    opencv      USE_OPENCV
+    openjpeg    USE_OPENJPEG
+    webp        USE_WEBP
+    pybind11    USE_PYTHON
+    tools       OIIO_BUILD_TOOLS
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -67,6 +67,10 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenImageIO)
 
+if ("tools" IN_LIST FEATURES)
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openimageio)
+endif()
+
 # Clean
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc
                     ${CURRENT_PACKAGES_DIR}/debug/doc