Commit 94af6fd1 authored by incardon's avatar incardon
Browse files

Merge branch 'develop'

parents 91850fe8 0f8c74a1
Pipeline #3457 passed with stages
in 7 minutes and 56 seconds
......@@ -24,10 +24,10 @@ mkdir openfpm_vcluster/src/config
git clone git@git.mpi-cbg.de:/openfpm/openfpm_devices.git openfpm_devices
git clone git@git.mpi-cbg.de:/openfpm/openfpm_data.git openfpm_data
cd openfpm_data
git checkout master
git checkout develop
cd ..
cd openfpm_devices
git checkout master
git checkout develop
cd ..
cd "$workspace/openfpm_vcluster"
......
......@@ -150,11 +150,16 @@ target_link_libraries(vcluster_test ${Boost_LIBRARIES})
target_link_libraries(vcluster_test ${PETSC_LIBRARIES})
target_link_libraries(vcluster_test ofpmmemory)
target_link_libraries(vcluster ofpmmemory)
target_link_libraries(vcluster_dl ofpmmemory)
target_link_libraries(vcluster_dl ${PETSC_LIBRARIES})
target_link_libraries(vcluster ${PETSC_LIBRARIES})
target_link_libraries(vcluster ofpmmemory)
target_link_libraries(vcluster_dl ofpmmemory)
if (TEST_COVERAGE)
target_link_libraries(vcluster_test -lgcov)
endif()
......
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