diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-17 16:16:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 16:16:37 -0800 |
| commit | 4c6cd02b42ae5b9d49043081c1ed6298f1ffe08a (patch) | |
| tree | fd784f377b204765ddbac0d2a9bfe67527a14edb /ports/vtk | |
| parent | 9cbdb33caf9975e5bd8b76da80df04d7cbfaa9e1 (diff) | |
| parent | a6b12004c7b29353a68a142eaa7493ca997e05e7 (diff) | |
| download | vcpkg-4c6cd02b42ae5b9d49043081c1ed6298f1ffe08a.tar.gz vcpkg-4c6cd02b42ae5b9d49043081c1ed6298f1ffe08a.zip | |
Merge pull request #3425 from fbudin69500/ITK_use_HDF5_test
[vtk][itk] Update ITK, and VTK portfiles.
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index d06f16331..0eb485dcd 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-3 +Version: 8.1.0-6 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 diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index edb245eb0..7a5536163 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") +endif() + include(vcpkg_common_functions) set(VTK_SHORT_VERSION "8.1") @@ -162,6 +166,7 @@ vcpkg_configure_cmake( -DVTK_INSTALL_DATA_DIR=share/vtk/data -DVTK_INSTALL_DOC_DIR=share/vtk/doc -DVTK_INSTALL_PACKAGE_DIR=share/vtk + -DVTK_INSTALL_RUNTIME_DIR=tools -DVTK_FORBID_DOWNLOADS=ON ${ADDITIONAL_OPTIONS} ) @@ -299,15 +304,14 @@ foreach(FILE IN LISTS CMAKE_FILES) endforeach() # ============================================================================= -# Move executable to tools directory and clean-up other directories -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/vtk) +# Clean-up other directories -function(_vtk_move_tool TOOL_NAME) - if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/${TOOL_NAME}.exe) - endif() - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) +function(_vtk_remove_tool TOOL_NAME) + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) + if(EXISTS ${filename}) + file(REMOVE ${filename}) + endif() endfunction() set(VTK_TOOLS @@ -331,7 +335,7 @@ 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) - _vtk_move_tool("${TOOL_NAME}") + _vtk_remove_tool("${TOOL_NAME}") endforeach() # ============================================================================= |