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

Merge topic 'examples_use_updated_cuda_found_var'

Browse Source 
ad4f6c64 All examples now use the proper CMake CUDA found variable.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !341
This commit is contained in:
Robert Maynard 2016-02-22 14:17:19 -05:00 committed by Kitware Robot
commit ea817bc7b8
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/clipping/CMakeLists.txt
View File

@ -28,7 +28,7 @@ set_property(
APPEND
PROPERTY COMPILE_DEFINITIONS "VTKM_DEVICE_ADAPTER=VTKM_DEVICE_ADAPTER_SERIAL")
if(VTKm_Cuda_FOUND)
if(VTKm_CUDA_FOUND)
set (cudaSource "${CMAKE_CURRENT_BINARY_DIR}/Clipping.cu")
configure_file(Clipping.cxx ${cudaSource} COPYONLY)

2
examples/hello_world/CMakeLists.txt
View File

@ -27,7 +27,7 @@ if(OPENGL_FOUND AND GLUT_FOUND)
target_link_libraries(HelloWorld_SERIAL ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${VTKm_LIBRARIES})
target_compile_options(HelloWorld_SERIAL PRIVATE ${VTKm_COMPILE_OPTIONS})
if(VTKm_Cuda_FOUND)
if(VTKm_CUDA_FOUND)
vtkm_disable_troublesome_thrust_warnings()
cuda_add_executable(HelloWorld_CUDA HelloWorld.cu)
target_link_libraries(HelloWorld_CUDA ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${VTKm_LIBRARIES})

2
examples/isosurface/CMakeLists.txt
View File

@ -26,7 +26,7 @@ if(OPENGL_FOUND AND GLUT_FOUND)
target_link_libraries(IsosurfaceUniformGrid_SERIAL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${VTKm_LIBRARIES})
target_compile_options(IsosurfaceUniformGrid_SERIAL PRIVATE ${VTKm_COMPILE_OPTIONS})
if(VTKm_Cuda_FOUND)
if(VTKm_CUDA_FOUND)
vtkm_disable_troublesome_thrust_warnings()
cuda_add_executable(IsosurfaceUniformGrid_CUDA IsosurfaceUniformGrid.cu)
target_link_libraries(IsosurfaceUniformGrid_CUDA ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${VTKm_LIBRARIES})

2
examples/multi_backend/CMakeLists.txt
View File

@ -20,7 +20,7 @@
##
##=============================================================================
if(VTKm_Cuda_FOUND)
if(VTKm_CUDA_FOUND)
cuda_add_executable(MultiBackend MultiBackend.cu)
else()
add_executable(MultiBackend MultiBackend.cxx)

2
examples/streamline/CMakeLists.txt
View File

@ -26,7 +26,7 @@ if(OPENGL_FOUND AND GLUT_FOUND)
target_link_libraries(StreamLineUniformGrid_SERIAL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
target_compile_options(StreamLineUniformGrid_SERIAL PRIVATE ${VTKm_COMPILE_OPTIONS})
if(VTKm_Cuda_FOUND)
if(VTKm_CUDA_FOUND)
cuda_add_executable(StreamLineUniformGrid_CUDA StreamLineUniformGrid.cu)
target_link_libraries(StreamLineUniformGrid_CUDA ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
target_compile_options(StreamLineUniformGrid_CUDA PRIVATE ${VTKm_COMPILE_OPTIONS})

2
examples/tetrahedra/CMakeLists.txt
View File

@ -41,7 +41,7 @@ if(OPENGL_FOUND AND GLUT_FOUND)
target_link_libraries(TriangulateUniformGrid_SERIAL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${VTKm_LIBRARIES})
target_compile_options(TriangulateUniformGrid_SERIAL PRIVATE ${VTKm_COMPILE_OPTIONS})
if(VTKm_Cuda_FOUND)
if(VTKm_CUDA_FOUND)
cuda_add_executable(TetrahedralizeExplicitGrid_CUDA TetrahedralizeExplicitGrid.cu)
target_link_libraries(TetrahedralizeExplicitGrid_CUDA ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${VTKm_LIBRARIES})
target_compile_options(TetrahedralizeExplicitGrid_CUDA PRIVATE ${VTKm_COMPILE_OPTIONS})