mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 12:07:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openimageio] Change feature name python to pybind11, add vcpkg_copy_tool_dependencies

Browse Source
This commit is contained in:
JackBoosY 2020-01-19 21:40:24 -08:00
parent 2ae9ee4955
commit e97271e2e8
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/openimageio/CONTROL
View File

@ -40,9 +40,9 @@ Feature: webp
Build-Depends: libwebp Build-Depends: libwebp
Description: Enable libwebp support for openimageio Description: Enable libwebp support for openimageio
Feature: python Feature: pybind11
Build-Depends: pybind11 Build-Depends: pybind11
Description: Enable pybind11 support for openimageio Description: Enable Python bindings support for openimageio
Feature: tools Feature: tools
Description: Build openimageio tools Description: Build openimageio tools

2
ports/openimageio/fix-tools-path.patch
View File

@ -7,7 +7,7 @@ index 9e54f67..d9c9437 100644
endif () endif ()
set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools") set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools")
- install_targets (${_target_NAME}) - install_targets (${_target_NAME})
+ install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools) + install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools/openimageio)
else () else ()
message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}") message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}")
endif () endif ()

24
ports/openimageio/portfile.cmake
View File

@ -28,17 +28,17 @@ else()
endif() endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
libraw USE_LIBRAW libraw USE_LIBRAW
opencolorio USE_OCIO opencolorio USE_OCIO
ffmpeg USE_FFMPEG ffmpeg USE_FFMPEG
field3d USE_FIELD3D field3d USE_FIELD3D
freetype USE_FREETYPE freetype USE_FREETYPE
gif USE_GIF gif USE_GIF
opencv USE_OPENCV opencv USE_OPENCV
openjpeg USE_OPENJPEG openjpeg USE_OPENJPEG
webp USE_WEBP webp USE_WEBP
python USE_PYTHON pybind11 USE_PYTHON
tools OIIO_BUILD_TOOLS tools OIIO_BUILD_TOOLS
) )
vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(PYTHON3)
@ -67,6 +67,10 @@ vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenImageIO) 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 # Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc
${CURRENT_PACKAGES_DIR}/debug/doc ${CURRENT_PACKAGES_DIR}/debug/doc