Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'enable-game-of-life'

Browse Source 
8c3c138bb Enable the Game of Life example back

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2169
This commit is contained in:
Sujin Philip 2020-07-08 12:56:57 +00:00 committed by Kitware Robot
commit 1e36ef1407
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/CMakeLists.txt
View File

@ -19,7 +19,7 @@ if(VTKm_ENABLE_EXAMPLES)
add_subdirectory(contour_tree_distributed)
add_subdirectory(cosmotools)
add_subdirectory(demo)
#add_subdirectory(game_of_life)
add_subdirectory(game_of_life)
add_subdirectory(hello_worklet)
add_subdirectory(histogram)
add_subdirectory(lagrangian)

2
vtkm/interop/internal/TransferToOpenGL.h
View File

@ -11,7 +11,7 @@
#define vtk_m_interop_internal_TransferToOpenGL_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/StorageBasic.h>
#include <vtkm/cont/Storage.h>
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
#include <vtkm/cont/serial/DeviceAdapterSerial.h>