From e4d0eb0ce24973195a801e4d61386ddb92f9bc7c Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 17 Jun 2020 11:47:49 +0200
Subject: [PATCH] src/CMakeLists.txt
---
src/CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18ab285..6e8d9a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,13 +62,8 @@ endif()
link_directories(${PARMETIS_ROOT} ${METIS_ROOT})
target_link_libraries(numerics ${Boost_LIBRARIES})
-<<<<<<< HEAD
-target_link_libraries(numerics -L${PARMETIS_ROOT}/lib parmetis)
target_link_libraries(numerics ${HDF5_LIBRARIES})
-=======
target_link_libraries(numerics ${PARMETIS_LIBRARIES})
-target_link_libraries(numerics -L${HDF5_ROOT}/lib hdf5 hdf5_hl)
->>>>>>> sparse_cl
target_link_libraries(numerics -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES})
target_link_libraries(numerics ${Vc_LIBRARIES})
if(PETSC_FOUND)
--
GitLab