Skip to content
Snippets Groups Projects
Commit f1424eec authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Fixing CMake for openfpm_devices

parent 1a4c7bea
No related branches found
No related tags found
No related merge requests found
Pipeline #3922 failed
...@@ -583,7 +583,8 @@ cd build ...@@ -583,7 +583,8 @@ cd build
## remove enerything ## remove enerything
echo "Calling cmake ../. $conf_options" echo "Calling cmake ../. $conf_options"
printf "cmake ../. $conf_options" > cmake_build_options printf "cmake ../. $conf_options" > cmake_build_options
rm ../openfpm_devices/error_code
rm ../error_code rm ../error_code
DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $conf_options DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $conf_options
if [ $? != 0 ]; then if [ $? != 0 ]; then
......
...@@ -318,6 +318,7 @@ HDF5_installed=0 ...@@ -318,6 +318,7 @@ HDF5_installed=0
HDF5_System_prv=1 HDF5_System_prv=1
LIBHILBERT_installed=0 LIBHILBERT_installed=0
VCDEVEL_installed=0 VCDEVEL_installed=0
CLANGOMP_installed=0
conf_err=1 conf_err=1
...@@ -402,7 +403,7 @@ else ...@@ -402,7 +403,7 @@ else
configure_options=" $configure_options --with-vcdevel=$i_dir/VCDEVEL " configure_options=" $configure_options --with-vcdevel=$i_dir/VCDEVEL "
VCDEVEL_installed=1 VCDEVEL_installed=1
elif [ $conf_err -eq 220 ]; then elif [ $conf_err -eq 220 ]; then
if [ x"$platform" == x"OSX" ]; then if [ x"$platform" == x"osx" ]; then
echo "OpenMP has not been found for your compiler" echo "OpenMP has not been found for your compiler"
if [ $CLANGOMP_installed -eq 1 ]; then if [ $CLANGOMP_installed -eq 1 ]; then
echo "Error the installation of openmp for clang failed" echo "Error the installation of openmp for clang failed"
...@@ -411,6 +412,7 @@ else ...@@ -411,6 +412,7 @@ else
solve_clangomp $platform solve_clangomp $platform
CLANGOMP_installed=1 CLANGOMP_installed=1
else else
echo "We do not know how to install OpenMP for your compiler"
exit 1 exit 1
fi fi
elif [ $conf_err -ne 0 ]; then elif [ $conf_err -ne 0 ]; then
......
openfpm_devices @ 50bea04a
Subproject commit 00da0588866ba06ebf971b45645eabcaeabb4b35 Subproject commit 50bea04ad0d2ea9ce9310f2ad515128e12ead1a0
...@@ -12,7 +12,7 @@ if [ x"$pcman" = x"" ]; then ...@@ -12,7 +12,7 @@ if [ x"$pcman" = x"" ]; then
fi fi
if [ x"$1" = x"osx" ]; then if [ x"$1" = x"osx" ]; then
commands[0]="$pcman install clang-omp" commands[0]="$pcman install libomp"
possible_solutions "${commands[@]}" possible_solutions "${commands[@]}"
fi fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment