VTKm within VTK configures and builds

Accelerators/Vtkm/CMakeLists.txt

@@ -17,10 +17,6 @@
 #ensure we link against our dependencies
 include(module.cmake)
 
-find_package(VTKm REQUIRED
-  OPTIONAL_COMPONENTS Serial CUDA TBB
-  )
-
 set(lib_srcs
   vtkmlib/PolyDataConverter.cxx
   vtkmlib/UnstructuredGridConverter.cxx

Accelerators/Vtkm/Testing/Cxx/CMakeLists.txt

 
-find_package(VTKm REQUIRED COMPONENTS Base)
 include_directories(${VTKm_INCLUDE_DIRS})
 
 vtk_add_test_cxx(${vtk-module}CxxTests tests

Accelerators/Vtkm/module.cmake

@@ -7,6 +7,7 @@ vtk_module(vtkAcceleratorsVTKm
     vtkFiltersGeneral
     vtkFiltersGeometry
     vtkImagingCore
+    vtkm
   TEST_DEPENDS
     vtkTestingCore
     vtkTestingRendering

ThirdParty/vtkm/CMakeLists.txt

+set(vtk_using_tbb OFF)
+set(vtkm_components_to_find Serial)
+if (VTK_SMP_IMPLEMENTATION_TYPE STREQUAL "TBB")
+  set(vtk_using_tbb ON)
+  list(APPEND vtkm_components_to_find TBB)
+endif()
+
+set(VTKm_ENABLE_TBB ${vtk_using_tbb} CACHE BOOL "Set to match VTK" FORCE)
+set(VTKm_ENABLE_TESTING OFF CACHE BOOL "Disabled when building as part of VTK" FORCE)
+set(VTKm_ENABLE_RENDERING OFF CACHE BOOL "Disabled when building as part of VTK" FORCE)
+set(VTKm_USE_64BIT_IDS ${VTK_USE_64BIT_IDS} CACHE BOOL "Set to match VTK" FORCE)
+
+add_subdirectory(vtk-m)
+
+set(vtkm_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/vtk-m/include)
+set(vtkm_LIBRARIES vtkm vtkm_cont)
+vtk_module_export_info()

ThirdParty/vtkm/module.cmake

+vtk_module(vtkm EXCLUDE_FROM_WRAPPING)