Commit 504ebaf7 authored by incardon's avatar incardon

Testing push

parent 26a2bc73
Pipeline #1874 failed with stages
in 18 seconds
......@@ -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()
......
......@@ -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
......
......@@ -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})
......
Markdown is supported
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