Commit a1df8b21 authored by incardon's avatar incardon

Fixing boost requirements

parent e8423ce7
Pipeline #844 failed with stages
in 14 minutes and 49 seconds
......@@ -26,6 +26,7 @@ set(PARMETIS_DIR ${PARMETIS_ROOT})
set(OPENBLAS_ROOT CACHE PATH "Root path for blas library")
set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CUDA_STANDARD 11)
if (OPENBLAS_ROOT)
set(OPENBLAS_DIR "{OPENBLAS_ROOT}")
......@@ -40,7 +41,7 @@ if(ENABLE_GPU)
find_package(CUDA)
endif()
find_package(Boost 1.52.0 COMPONENTS unit_test_framework iostreams program_options)
find_package(Boost 1.66.0 COMPONENTS unit_test_framework iostreams program_options)
find_package(MPI)
find_package(PETSc)
find_package(HDF5)
......
openfpm_data @ 0f544774
Subproject commit e21987398a248552a20ee803a529dc25513ea21f
Subproject commit 0f5447746f8daaf1d810eb0d92dda005d026a6ee
openfpm_devices @ a2aae186
Subproject commit 2842c2506489b4daed7e0b4d143bbe8c61ff014a
Subproject commit a2aae1861243196e9dcc9944e470e26a4b49ad96
openfpm_io @ 6303a6bd
Subproject commit 1aaf1cc8ccd73fd212a117046a3ec9ec815d4e31
Subproject commit 6303a6bd3631df7b334bba53ceeb4bc96beaca12
openfpm_numerics @ c7d1c6a3
Subproject commit a0512d62a5803df3b6890dc234c9ec7818915ddf
Subproject commit c7d1c6a3859ecc8a82e7114b007a621c92c1832d
openfpm_vcluster @ 850cc5b2
Subproject commit f56bb4396c3fef276041e222357099008bdf0619
Subproject commit 850cc5b2ff4240bb7d82f3bfc1e1b44ad3fffd43
......@@ -7,11 +7,11 @@ if [ -d "$1/BOOST" ]; then
exit 0
fi
wget http://ppmcore.mpi-cbg.de/upload/boost_1_63_0.tar.bz2
tar -xvf boost_1_63_0.tar.bz2
cd boost_1_63_0
wget http://ppmcore.mpi-cbg.de/upload/boost_1_68_0.tar.bz2
tar -xvf boost_1_68_0.tar.bz2
cd boost_1_68_0
./bootstrap.sh --with-toolset=$3
mkdir $1/BOOST
./b2 -j $2 install --prefix=$1/BOOST
rm -rf boost_1_63_0
rm -rf boost_1_68_0
......@@ -76,10 +76,10 @@ function remove_old()
## Check the installed version of the dependencies
if [ -d $1/BOOST ]; then
is_update=$(cat $1/BOOST/include/boost/version.hpp | grep "#define BOOST_VERSION 106300")
is_update=$(cat $1/BOOST/include/boost/version.hpp | grep "#define BOOST_VERSION 106800")
if [ x"$is_update" == x"" ]; then
echo -e "\033[1;34;5m --------------------------------------------------------------------------- \033[0m"
echo -e "\033[1;34;5m Boost has been updated to 1.63, the component will be updated automatically \033[0m"
echo -e "\033[1;34;5m Boost has been updated to 1.68, the component will be updated automatically \033[0m"
echo -e "\033[1;34;5m --------------------------------------------------------------------------- \033[0m"
sleep 5
rm -rf $1/BOOST/include
......
......@@ -15,7 +15,7 @@ add_library(ofpm_pdata STATIC lib/pdata.cpp)
###########################
if (CUDA_FOUND)
target_compile_options(pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe "--display_error_number --diag_suppress=2885 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111" --expt-extended-lambda>)
target_compile_options(pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe "--display_error_number --diag_suppress=611 --diag_suppress=2885 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111" --expt-extended-lambda>)
target_include_directories (pdata PUBLIC ${MPI_C_INCLUDE_DIRS})
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