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

[vtk] Refactor fixup to be less hacky. PCL builds for x86-windows.

Browse Source
This commit is contained in:
Robert Schumacher 2017-11-10 01:23:10 -08:00
parent 00952c99d6
commit 318613d2b2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vtk/CONTROL
View File

@ -1,5 +1,5 @@
Source: vtk Source: vtk
Version: 8.0.1-4 Version: 8.0.1-5
Description: Software system for 3D computer graphics, image processing, and visualization Description: Software system for 3D computer graphics, image processing, and visualization
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora

2
ports/vtk/FindHDF5.cmake
View File

@ -20,7 +20,7 @@ else()
message(FATAL_ERROR "could not find target hdf5_hl-*") message(FATAL_ERROR "could not find target hdf5_hl-*")
endif() endif()
set(HDF5_LIBRARIES "$<BUILD_INTERFACE:$<$<NOT:$<STREQUAL:\${UNUSED_VARIABLE_NAME_GOES_HERE_VTK},>>:vtk::hdf5::hdf5>>" "$<BUILD_INTERFACE:$<$<NOT:$<STREQUAL:\${UNUSED_VARIABLE_NAME_GOES_HERE_VTK},>>:vtk::hdf5::hdf5_hl>>") set(HDF5_LIBRARIES "$<BUILD_INTERFACE:vtk::hdf5::hdf5>" "$<BUILD_INTERFACE:vtk::hdf5::hdf5_hl>")
find_package_handle_standard_args(HDF5 find_package_handle_standard_args(HDF5
REQUIRED_VARS HDF5_INCLUDE_DIRS HDF5_LIBRARIES REQUIRED_VARS HDF5_INCLUDE_DIRS HDF5_LIBRARIES

5
ports/vtk/portfile.cmake
View File

@ -320,6 +320,11 @@ set(VTK_TOOLS
pvtkpython pvtkpython
) )
file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents)
string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}")
string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}")
foreach(TOOL_NAME IN LISTS VTK_TOOLS) foreach(TOOL_NAME IN LISTS VTK_TOOLS)
_vtk_move_tool("${TOOL_NAME}") _vtk_move_tool("${TOOL_NAME}")
endforeach() endforeach()