diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-03-18 14:34:55 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-03-18 14:34:55 -0700 |
| commit | ec22cd193c16f0c4535d25bf9a25a748eb8b0a0f (patch) | |
| tree | f3eae2b008a62d628620f1fc8bd2461284d60eaf /ports/vtk | |
| parent | 8a35867b738098745981d67729e955930603252a (diff) | |
| parent | 769ec61adde67306f73aa691d50d3d5e66fb99ae (diff) | |
| download | vcpkg-ec22cd193c16f0c4535d25bf9a25a748eb8b0a0f.tar.gz vcpkg-ec22cd193c16f0c4535d25bf9a25a748eb8b0a0f.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5692
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} ) |