diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-03-18 14:03:35 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-03-18 14:03:35 -0700 |
| commit | 4cfeb475dd8b0b9b0cc13d9f1d45360dd88c0982 (patch) | |
| tree | 8ea92325d40107dc4b1f96d6063b8189c4e088e7 /ports/vtk | |
| parent | d61392b3ae23291465945cc728913d5089c6359d (diff) | |
| parent | aed7d2e2146b26edc9943d650f391ef2407e5a54 (diff) | |
| download | vcpkg-4cfeb475dd8b0b9b0cc13d9f1d45360dd88c0982.tar.gz vcpkg-4cfeb475dd8b0b9b0cc13d9f1d45360dd88c0982.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5699
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 4 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 7bd4d5b3d..0d489e677 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,7 +1,7 @@ Source: vtk -Version: 8.2.0-1 +Version: 8.2.0-2 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, atlmfc (windows) Feature: openvr Description: OpenVR functionality for VTK diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 06773528e..baff2cb06 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -115,6 +115,12 @@ if(VTK_WITH_ALL_MODULES) ) endif() +if(NOT VCPKG_CMAKE_SYSTEM_NAME) + set(Module_vtkGUISupportMFC ON) +else() + set(Module_vtkGUISupportMFC OFF) +endif() + # ============================================================================= # Configure & Install if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static") @@ -154,6 +160,7 @@ vcpkg_configure_cmake( -DVTK_INSTALL_PACKAGE_DIR=share/vtk -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON + -DModule_vtkGUISupportMFC=${Module_vtkGUISupportMFC} ${ADDITIONAL_OPTIONS} ) |