Export: VTK-m module is now exported into the VTKConfig.cmake

CMake/VTKConfig.cmake.in

@@ -80,6 +80,20 @@ else()
   endif ()
 endif()
 
+# Setup VTK-m if it was enabled
+set(VTK_HAS_VTKM @Module_vtkm@)
+if(VTK_HAS_VTKM AND __vtk_install_tree)
+  set(VTKM_CMAKE_DIR "${VTKM_CMAKE_DIR}")
+  get_filename_component(VTKM_CMAKE_DIR "${VTKM_CMAKE_DIR}" PATH)
+  find_package(VTKm
+               PATHS "${CMAKE_CURRENT_LIST_DIR}"
+                     "${VTKM_CMAKE_DIR}"
+                     "${VTK_RUNTIME_DIRS}"
+               NO_DEFAULT_PATH
+               )
+endif()
+
+
 #-----------------------------------------------------------------------------
 # Load requested modules.
 

ThirdParty/vtkm/CMakeLists.txt

@@ -31,8 +31,13 @@ if (NOT GLEW_INCLUDE_DIR)
   set(GLEW_needs_unset ON)
 endif()
 
+set(vtkm_LIBRARIES vtkm vtkm_cont)
+vtk_module_export_info()
 add_subdirectory(vtk-m)
 
+vtk_target_export(vtkm)
+vtk_target_export(vtkm_cont)
+
 if (GLEW_needs_unset)
   unset(GLEW_INCLUDE_DIR CACHE)
   unset(GLEW_LIBRARY CACHE)
@@ -40,7 +45,7 @@ if (GLEW_needs_unset)
 endif()
 
 set(vtkm_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/vtk-m/include)
-set(vtkm_LIBRARIES vtkm_cont)
-vtk_module_export_info()
+
+
 
 set_target_properties(vtkm PROPERTIES INTERFACE_LINK_LIBRARIES vtkm_cont)