diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-19 21:40:24 -0800 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-19 21:42:41 -0800 |
| commit | e97271e2e8e5ae2265d05c82a439e3eb88f6e448 (patch) | |
| tree | 483c7e61767db5141da1aa0f835e58f7adab8b3a | |
| parent | 2ae9ee4955dd8092fef118fdabefc255b1154366 (diff) | |
| download | vcpkg-e97271e2e8e5ae2265d05c82a439e3eb88f6e448.tar.gz vcpkg-e97271e2e8e5ae2265d05c82a439e3eb88f6e448.zip | |
[openimageio] Change feature name python to pybind11, add vcpkg_copy_tool_dependencies
| -rw-r--r-- | ports/openimageio/CONTROL | 4 | ||||
| -rw-r--r-- | ports/openimageio/fix-tools-path.patch | 2 | ||||
| -rw-r--r-- | ports/openimageio/portfile.cmake | 24 |
3 files changed, 17 insertions, 13 deletions
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index d4cb9eff8..728f22a6b 100644 --- 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
\ No newline at end of file diff --git a/ports/openimageio/fix-tools-path.patch b/ports/openimageio/fix-tools-path.patch index 07e02fddf..b7bf3753b 100644 --- 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 index 43ee950c2..7e6a6aae3 100644 --- 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 |