aboutsummaryrefslogtreecommitdiff
path: root/ports/vtk/portfile.cmake
diff options
context:
space:
mode:
authorBilly Robert O'Neal III <bion@microsoft.com>2020-08-28 16:31:27 -0700
committerBilly Robert O'Neal III <bion@microsoft.com>2020-08-28 16:31:27 -0700
commitc828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch)
treeb3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/vtk/portfile.cmake
parent6635a2fa596ca457565eebc2a45664309cd24d77 (diff)
parentf3f329a048eaff759c1992c458f2e12351486bc7 (diff)
downloadvcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.tar.gz
vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.zip
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/vtk/portfile.cmake')
-rw-r--r--ports/vtk/portfile.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index d657f241f..d2dc3e2c7 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -68,6 +68,13 @@ endif()
if("mpi" IN_LIST FEATURES)
list(APPEND ADDITIONAL_OPTIONS
-DVTK_GROUP_ENABLE_MPI=YES
+ -DVTK_USE_MPI=YES
+ )
+endif()
+
+if("mpi" IN_LIST FEATURES AND "python" IN_LIST FEATURES)
+ list(APPEND ADDITIONAL_OPTIONS
+ -DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=OFF
)
endif()
@@ -120,7 +127,7 @@ vcpkg_from_github(
python_debug.patch
fix-using-hdf5.patch
# Last patch TODO: Patch out internal loguru
- FindExpat.patch
+ FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat
)
# =============================================================================