From afb9b6c0a3af869352a9071e9b1a657f883a7177 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Thu, 22 Oct 2015 16:38:24 -0500 Subject: [PATCH] Add support for automatic choice of Trilinos version. --- candi.sh | 11 ++++++++++- project-deal.II.cfg | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/candi.sh b/candi.sh index 26daff2..b45acad 100755 --- a/candi.sh +++ b/candi.sh @@ -415,7 +415,7 @@ guess_platform() { local CODENAME=$(lsb_release -c -s) local DESCRIPTION=$(lsb_release -d -s) case ${DISTRO}:${CODENAME}:${DESCRIPTION} in - *:*:*Ubuntu*\ 13*) echo ubuntu13;; + *:*:*Ubuntu*\ 12*) echo ubuntu12;; *:*:*Ubuntu*\ 14*) echo ubuntu14;; *:*:*Ubuntu*\ 15*) echo ubuntu15;; *:Tikanga*:*) echo rhel5;; @@ -706,6 +706,15 @@ guess_architecture # Reset timings TIMINGS="" +# If TRILINOS_MAJOR_VERSION is set to AUTO, pick Trilinos 11 except for Ubuntu 12 +if [[ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]]; then + if [[ ${PLATFORM} == *"ubuntu12"* ]]; then + TRILINOS_MAJOR_VERSION=11 + else + TRILINOS_MAJOR_VERSION=12 + fi +fi + # Fetch and build individual packages for PACKAGE in ${PACKAGES[@]}; do # Start timer diff --git a/project-deal.II.cfg b/project-deal.II.cfg index 9ce6ebe..633806f 100644 --- a/project-deal.II.cfg +++ b/project-deal.II.cfg @@ -73,7 +73,9 @@ fi ######################################################################### # If you want to use Trilions, decide if you want v11.x.x or v12.x.x -TRILINOS_MAJOR_VERSION=12 +TRILINOS_MAJOR_VERSION=AUTO +#TRILINOS_MAJOR_VERSION=11 +#TRILINOS_MAJOR_VERSION=12 ######################################################################### -- 2.39.5