Merge topic 'examples_use_updated_cuda_found_var'
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:
commit
ea817bc7b8
@ -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)
|
||||
|
||||
|
@ -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})
|
||||
|
@ -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})
|
||||
|
@ -20,7 +20,7 @@
|
||||
##
|
||||
##=============================================================================
|
||||
|
||||
if(VTKm_Cuda_FOUND)
|
||||
if(VTKm_CUDA_FOUND)
|
||||
cuda_add_executable(MultiBackend MultiBackend.cu)
|
||||
else()
|
||||
add_executable(MultiBackend MultiBackend.cxx)
|
||||
|
@ -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})
|
||||
|
@ -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})
|
||||
|
Loading…
Reference in New Issue
Block a user