From 1ff1628c38549e4cacff6bba8ed7e103b1d40082 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Thu, 22 Oct 2015 20:28:19 +0200 Subject: [PATCH] deal.II: allows to build Trilinos 11 or 12 --- deal.II/packages/trilinos.package | 15 ++++++++++++--- deal.II/platforms/supported/fedora22.platform | 1 - project-deal.II.cfg | 5 +++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package index d82788e..d6a4c92 100644 --- a/deal.II/packages/trilinos.package +++ b/deal.II/packages/trilinos.package @@ -1,9 +1,18 @@ -VERSION=12.2.1 +if [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then + SOURCE=https://trilinos.org/oldsite/download/files/ + VERSION=11.6.2 + CHECKSUM=15ea6af5559f872919ff19fe5a322eb6 +fi + +if [ ${TRILINOS_MAJOR_VERSION} = "12" ]; then + SOURCE=http://trilinos.csbsju.edu/download/files/ + VERSION=12.2.1 + CHECKSUM=760f14cbce482b4b9a41d1c18297b531 +fi + NAME=trilinos-${VERSION}-Source -SOURCE=http://trilinos.csbsju.edu/download/files/ PACKING=.tar.bz2 DOWNLOADER=curl -CHECKSUM=760f14cbce482b4b9a41d1c18297b531 BUILDCHAIN=cmake ######################################################################### diff --git a/deal.II/platforms/supported/fedora22.platform b/deal.II/platforms/supported/fedora22.platform index 1fc73b7..20e6c26 100644 --- a/deal.II/platforms/supported/fedora22.platform +++ b/deal.II/platforms/supported/fedora22.platform @@ -35,4 +35,3 @@ once:petsc once:slepc dealii ) - diff --git a/project-deal.II.cfg b/project-deal.II.cfg index 7e12ea4..9ce6ebe 100644 --- a/project-deal.II.cfg +++ b/project-deal.II.cfg @@ -72,6 +72,11 @@ fi ######################################################################### +# If you want to use Trilions, decide if you want v11.x.x or v12.x.x +TRILINOS_MAJOR_VERSION=12 + +######################################################################### + # Do you want to use MKL? MKL=OFF # MKL_DIR= -- 2.39.5