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

Unit_tests are built with the correct compiler when cuda is enabled.

Browse Source 
Previously all the Unit_tests that shared source files would use cuda
once CUDA set the language on the file.
This commit is contained in:
Robert Maynard 2017-12-29 12:38:51 -05:00
parent afc19ab0fc
commit b2c03ad858
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMake/VTKmWrappers.cmake
View File

@ -237,7 +237,20 @@ function(vtkm_unit_tests)
endif()
if(VTKm_UT_BACKEND STREQUAL "CUDA")
set_source_files_properties(${VTKm_UT_SOURCES} PROPERTIES LANGUAGE "CUDA")
#we can't mark the files as CUDA here since that would mean that
#for all other backends they would be built as CUDA too. Instead we
#generate a build directory file with a .cu extension
set( cuda_srcs )
foreach(file ${VTKm_UT_SOURCES})
get_filename_component(fname "${file}" NAME_WE)
get_filename_component(fullpath "${file}" ABSOLUTE)
list(APPEND cuda_srcs "${fname}.cu")
file(GENERATE
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${fname}.cu
CONTENT "#include \"${fullpath}\"")
endforeach()
set(VTKm_UT_SOURCES ${cuda_srcs})
endif()
create_test_sourcelist(TestSources ${test_prog}.cxx ${VTKm_UT_SOURCES})

8
vtkm/worklet/testing/CMakeLists.txt
View File

@ -70,9 +70,9 @@ set(unit_tests
vtkm_unit_tests(NAME Worklets BACKEND SERIAL SOURCES ${unit_tests})
if (VTKm_ENABLE_CUDA)
vtkm_unit_tests(NAME Worklets BACKEND CUDA SOURCES ${unit_tests})
endif()
if (VTKm_ENABLE_TBB)
vtkm_unit_tests(NAME Worklets BACKEND TBB SOURCES ${unit_tests})
vtkm_unit_tests(NAME Worklets BACKEND TBB SOURCES ${unit_tests})
endif()
if (VTKm_ENABLE_CUDA)
vtkm_unit_tests(NAME Worklets BACKEND CUDA SOURCES ${unit_tests})
endif()