From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Thu, 22 Oct 2015 23:06:53 +0000 (-0500)
Subject: Clean auto-choice of Trilinos version.
X-Git-Tag: v0.7~11^2~6^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3020cbbba0d3649a3857e267515c356f4efd04f;p=candi.git

Clean auto-choice of Trilinos version.
---

diff --git a/candi.sh b/candi.sh
index b45acad..a974c63 100755
--- a/candi.sh
+++ b/candi.sh
@@ -441,6 +441,9 @@ 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
@@ -706,13 +709,8 @@ 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
+  TRILINOS_MAJOR_VERSION=${TRILINOS_MAJOR_VERSION_AUTO}
 fi
 
 # Fetch and build individual packages