Skip to content
Snippets Groups Projects
Commit 003a9846 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Fixing conflicts

parent 7f312322
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
src/CMakeLists.txt
+ 0
− 3
View file @ 003a9846
...@@ -37,12 +37,9 @@ endif() ...@@ -37,12 +37,9 @@ endif()
if(CUDA_FOUND) if(CUDA_FOUND)
target_compile_options(numerics PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >) target_compile_options(numerics PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
<<<<<<< HEAD
if (TEST_COVERAGE) if (TEST_COVERAGE)
target_compile_options(numerics PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >) target_compile_options(numerics PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
endif() endif()
=======
>>>>>>> sparse_cl
endif() endif()
target_include_directories (numerics PUBLIC ${CUDA_INCLUDE_DIRS}) target_include_directories (numerics PUBLIC ${CUDA_INCLUDE_DIRS})
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment