From 504ebaf71e10c795bf5c6f453c0b82a5e4aeb8c6 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 25 Mar 2020 11:35:17 +0100
Subject: [PATCH] Testing push
---
CMakeLists.txt | 7 +++++++
install | 10 ++++++++++
src/CMakeLists.txt | 2 ++
3 files changed, 19 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 504206f29..61c29ca04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,6 +184,13 @@ if(SUITESPARSE_FOUND AND SuiteSparse_UMFPACK_FOUND)
set(DEFINE_HAVE_SUITESPARSE "#define HAVE_SUITESPARSE")
endif()
+if (Vc_FOUND)
+ set(DEFINE_HAVE_VCDEVEL)
+else()
+ file(WRITE error_code "211")
+ message( FATAL_ERROR "Vc is required in roder to install OpenFPM")
+endif()
+
if(APPLE)
set(DEFINE_HAVE_OSX "#define HAVE_OSX")
endif()
diff --git a/install b/install
index f69f7762d..1cc69d9be 100755
--- a/install
+++ b/install
@@ -317,6 +317,7 @@ EIGEN_System_prv=1
HDF5_installed=0
HDF5_System_prv=1
LIBHILBERT_installed=0
+VCDEVEL_installed=0
conf_err=1
@@ -387,6 +388,15 @@ else
./script/install_LIBHILBERT.sh $i_dir $ncore
configure_options=" $configure_options --with-libhilbert=$i_dir/LIBHILBERT "
LIBHILBERT_installed=1
+ elif [ $conf_err -eq 211 ]; then
+ echo "VCDEVEL not found try to install"
+ if [ $LIBHILBERT_installed -eq 1 ]; then
+ echo "Error the installation of VCDEVEL failed"
+ exit 1
+ fi
+ ./script/install_VCDEVEL.sh $i_dir $ncore
+ configure_options=" $configure_options --with-vcdevel=$i_dir/VCDEVEL "
+ VCDEVEL_installed=1
elif [ $conf_err -ne 0 ]; then
echo "I do not know how to recover from this error"
exit 1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 995632ec8..8285a7dea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,6 +84,7 @@ target_include_directories (pdata PUBLIC ${PETSC_INCLUDES})
target_include_directories (pdata PUBLIC ${HDF5_ROOT}/include)
target_include_directories (pdata PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
+target_include_directories(pdata PUBLIC ${Vc_INCLUDE_DIR})
target_include_directories (pdata PUBLIC ${Boost_INCLUDE_DIRS})
target_link_libraries(pdata ${Boost_LIBRARIES})
@@ -92,6 +93,7 @@ target_link_libraries(pdata -L${METIS_ROOT}/lib metis)
target_link_libraries(pdata -L${HDF5_ROOT}/lib hdf5 hdf5_hl)
target_link_libraries(pdata -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES})
target_link_libraries(pdata ${PETSC_LIBRARIES})
+target_link_libraries(pdata ${Vc_LIBRARIES})
if (TEST_PERFORMANCE)
target_link_libraries(pdata ${Boost_FILESYSTEM_LIBRARY})
--
GitLab