Task/update vtkm tag (#110)

* updating vtkm tag * fixing using with cmake
Alpine-DAV · Mar 31, 2018 · 9f32171 · 9f32171
1 parent 1d1feac
commit 9f32171
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cmake/thirdparty/SetupVTKm.cmake b/src/cmake/thirdparty/SetupVTKm.cmake
@@ -53,7 +53,7 @@ endif()
 MESSAGE(STATUS "Looking for VTKm using VTKM_DIR = ${VTKM_DIR}")
 
 # use VTKM_DIR to setup the options that cmake's find VTKm needs
-set(VTKm_DIR ${VTKM_DIR}/lib/cmake/vtkm-1.1)
+set(VTKm_DIR ${VTKM_DIR}/lib/cmake/vtkm-1.2)
 
 #
 # VTKm will find TBB via the env var "TBB_ROOT"

diff --git a/src/examples/using-with-cmake/FindVTKm.cmake b/src/examples/using-with-cmake/FindVTKm.cmake
@@ -69,14 +69,14 @@ if(NOT VTKM_DIR)
   MESSAGE(FATAL_ERROR "Could not find VTKM_DIR. Conduit requires explicit VTKM_DIR.")
 endif()
 
-if(NOT EXISTS ${VTKM_DIR}/lib/cmake/vtkm-1.1/VTKmConfig.cmake)
+if(NOT EXISTS ${VTKM_DIR}/lib/cmake/vtkm-1.2/VTKmConfig.cmake)
   MESSAGE(FATAL_ERROR "Could not find VTKm CMake include file (${VTKM_DIR}/lib/cmake/vtkm-1.0/VTKmConfig.cmake)")
 endif()
 
 ###############################################################################
 # Import VTKm CMake targets
 ###############################################################################
-include(${VTKM_DIR}/lib/cmake/vtkm-1.1/VTKmConfig.cmake)
+include(${VTKM_DIR}/lib/cmake/vtkm-1.2/VTKmConfig.cmake)
 
 ###############################################################################
 # Set remaning CMake variables