From 003a9846a81657562ec60e0a8d3fa91dd50f6c5e Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 17 Jun 2020 11:36:04 +0200
Subject: [PATCH] Fixing conflicts
---
src/CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e161c5d6..18ab2850 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,12 +37,9 @@ endif()
if(CUDA_FOUND)
target_compile_options(numerics PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
-<<<<<<< HEAD
if (TEST_COVERAGE)
target_compile_options(numerics PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
endif()
-=======
->>>>>>> sparse_cl
endif()
target_include_directories (numerics PUBLIC ${CUDA_INCLUDE_DIRS})
--
GitLab