From e307fb9cb932fa5b2dad377c94546e67f9885e0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Fri, 23 Oct 2015 09:50:27 +0200 Subject: [PATCH] deal.II: Moved some variables for Trilinos versioning out of candi.sh --- candi.sh | 8 -------- deal.II/packages/trilinos.package | 4 ++++ deal.II/platforms/supported/ubuntu12.platform | 9 ++++++++- project-deal.II.cfg | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/candi.sh b/candi.sh index a974c63..3a5ce5f 100755 --- a/candi.sh +++ b/candi.sh @@ -440,10 +440,6 @@ guess_architecture() { ############################################################################### # Start the build process - -# Set the default version of Trilinos to 12. This is overwritten for Ubuntu12 -TRILINOS_MAJOR_VERSION_AUTO=12 - export ORIG_DIR=`pwd` # Read configuration variables from candi.cfg @@ -709,10 +705,6 @@ guess_architecture # Reset timings TIMINGS="" -if [[ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]]; then - TRILINOS_MAJOR_VERSION=${TRILINOS_MAJOR_VERSION_AUTO} -fi - # Fetch and build individual packages for PACKAGE in ${PACKAGES[@]}; do # Start timer diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package index d6a4c92..9422db8 100644 --- a/deal.II/packages/trilinos.package +++ b/deal.II/packages/trilinos.package @@ -1,3 +1,7 @@ +if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ]; then + TRILINOS_MAJOR_VERSION=12 +fi + if [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then SOURCE=https://trilinos.org/oldsite/download/files/ VERSION=11.6.2 diff --git a/deal.II/platforms/supported/ubuntu12.platform b/deal.II/platforms/supported/ubuntu12.platform index a96d306..f4325d6 100644 --- a/deal.II/platforms/supported/ubuntu12.platform +++ b/deal.II/platforms/supported/ubuntu12.platform @@ -24,5 +24,12 @@ once:slepc dealii ) +# The default compiler on ubuntu12 does not support Trilinos 12. +# Anyhow, the user can decide to use Trilinos 11 or 12, if the +# version number is not set to AUTO. +# The last point is due to own compilers (e.g. intel) which support +# Trilinos 12. +if [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then + TRILINOS_MAJOR_VERSION=11 +fi -TRILINOS_MAJOR_VERSION_AUTO=11 diff --git a/project-deal.II.cfg b/project-deal.II.cfg index 633806f..4eaa54c 100644 --- a/project-deal.II.cfg +++ b/project-deal.II.cfg @@ -72,7 +72,7 @@ fi ######################################################################### -# If you want to use Trilions, decide if you want v11.x.x or v12.x.x +# If you want to use Trilions, decide if you want v12.x.x (AUTO) or v11.x.x TRILINOS_MAJOR_VERSION=AUTO #TRILINOS_MAJOR_VERSION=11 #TRILINOS_MAJOR_VERSION=12 -- 2.39.5