Commit f7c2227e authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

update vtk (fixes #18193)

parent f34ee396
......@@ -33,9 +33,9 @@ set (PARAVIEW_USE_FILE ${ParaView_USE_FILE})
set (PARAVIEW_CMAKE_DIR ${ParaView_CMAKE_DIR})
# Setup VTK-m if it was enabled
set(VTK_HAS_VTKM @VTK_HAS_VTKM@)
if(VTK_HAS_VTKM)
set(VTKM_CMAKE_DIR "${ParaView_CMAKE_DIR}")
set(PARAVIEW_USE_VTKM @PARAVIEW_USE_VTKM@)
if(PARAVIEW_USE_VTKM)
set(VTKM_CMAKE_DIR "${VTK_CMAKE_DIR}")
if(NOT __vtk_install_tree)
set(VTKM_CMAKE_DIR "@VTKm_BINARY_DIR@/@VTK_INSTALL_PACKAGE_DIR@/vtkm")
endif()
......@@ -43,6 +43,7 @@ if(VTK_HAS_VTKM)
find_package(VTKm
PATHS "${CMAKE_CURRENT_LIST_DIR}"
"${VTKM_CMAKE_DIR}"
"${VTK_RUNTIME_DIRS}"
NO_DEFAULT_PATH
)
endif()
......
Subproject commit 7eded0879fca0c3e292a458c4edd2c11a657013b
Subproject commit 42f7955511449e5df898f355dd0023cfffadeaaa
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment