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

Correct issues when CUDA is enabled.

Browse Source
This commit is contained in:
Robert Maynard 2017-10-06 09:48:12 -04:00
parent ed8f4111ef
commit db3e97bac6
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/VTKmWrappers.cmake
View File

@ -142,7 +142,7 @@ function(vtkm_library)
set(lib_name ${VTKm_LIB_NAME})
if(VTKm_ENABLE_CUDA)
set_source_files_properties(${VTKm_LIB_WRAP_FOR_CUDA} LANGUAGE "CUDA")
set_source_files_properties(${VTKm_LIB_WRAP_FOR_CUDA} PROPERTIES LANGUAGE "CUDA")
endif()

17
examples/demo/CMakeLists.txt
View File

@ -27,15 +27,16 @@ find_package(VTKm REQUIRED QUIET)
if(TARGET vtkm_rendering)
set(backend "VTKM_DEVICE_ADAPTER_SERIAL")
if(TARGET vtkm::cuda)
set_source_files_properties(Demo.cxx PROPERTIES LANGUAGE "CUDA")
set(backend "VTKM_DEVICE_ADAPTER_CUDA")
elseif(TARGET vtkm::tbb)
set(backend "VTKM_DEVICE_ADAPTER_TBB")
endif()
add_executable(Demo Demo.cxx)
target_link_libraries(Demo PRIVATE vtkm_rendering)
target_compile_definitions(Demo PRIVATE "VTKM_DEVICE_ADAPTER=${backend}")
if(TARGET vtkm::cuda)
set_source_files_properties(Demo.cxx LANGUAGE "CUDA")
target_compile_definitions(Demo
PRIVATE "VTKM_DEVICE_ADAPTER=VTKM_DEVICE_ADAPTER_CUDA")
elseif(TARGET vtkm::tbb)
target_compile_definitions(Demo
PRIVATE "VTKM_DEVICE_ADAPTER=VTKM_DEVICE_ADAPTER_TBB")
endif()
endif()

2
examples/game_of_life/CMakeLists.txt
View File

@ -31,7 +31,7 @@ if(TARGET OpenGL::GL AND
TARGET GLEW::GLEW)
if(TARGET vtkm::cuda)
set_source_files_properties(GameOfLife.cxx LANGUAGE "CUDA")
set_source_files_properties(GameOfLife.cxx PROPERTIES LANGUAGE "CUDA")
endif()
add_executable(GameOfLife GameOfLife.cxx LoadShaders.h)

2
examples/multi_backend/CMakeLists.txt
View File

@ -26,7 +26,7 @@ project(MultiBackend CXX)
find_package(VTKm REQUIRED QUIET)
if(TARGET vtkm::cuda)
set_source_files_properties(MultiBackend.cxx LANGUAGE "CUDA")
set_source_files_properties(MultiBackend.cxx PROPERTIES LANGUAGE "CUDA")
endif()
add_executable(MultiBackend MultiBackend.cxx)