From 4bc195f23ae0e23a0fc9fbb1fd16fbe7d2ff60c1 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Fri, 30 Nov 2018 16:16:24 +0100 Subject: [PATCH] Fixing installation of EIGEN --- openfpm_numerics | 2 +- script/install_EIGEN.sh | 2 +- script/install_SUITESPARSE.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openfpm_numerics b/openfpm_numerics index 3f2f657b1..080e76bf8 160000 --- a/openfpm_numerics +++ b/openfpm_numerics @@ -1 +1 @@ -Subproject commit 3f2f657b142d220689c134e7b005473b8edfd9cf +Subproject commit 080e76bf8659c08438eec04041450045cb044c2a diff --git a/script/install_EIGEN.sh b/script/install_EIGEN.sh index 0b67506eb..75d19c93d 100755 --- a/script/install_EIGEN.sh +++ b/script/install_EIGEN.sh @@ -13,7 +13,7 @@ if [ ! -d "$1/OPENBLAS" ]; then fi CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_SUITESPARSE.sh $1 $2 -if [ ! -d "$1/SUITESPARSE" ]; then +if [ ! -d "$1/SUITESPARSE" -o ! -f "$1/SUITESPARSE/include/umfpack.h" ]; then exit 1 fi diff --git a/script/install_SUITESPARSE.sh b/script/install_SUITESPARSE.sh index f3f3c7983..4d36f9cb7 100755 --- a/script/install_SUITESPARSE.sh +++ b/script/install_SUITESPARSE.sh @@ -7,7 +7,7 @@ discover_os # check if the directory $1/SUITESPARSE exist -if [ -d "$1/SUITESPARSE" ]; then +if [ -d "$1/SUITESPARSE" -a -f "$1/SUITESPARSE/include/umfpack.h" ]; then echo "SUITESPARSE is already installed" exit 0 fi -- GitLab