From f8da8dbd0e52499fe7a27d1a7d8cd6fe49313918 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 28 Feb 2019 11:05:05 -0600 Subject: Trilinos: add release 12.14.1 (#10740) xsdk: switch from 12.14.0-rc1 to 12.14.1 --- var/spack/repos/builtin/packages/trilinos/package.py | 4 ++-- var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 69f1c6d547..4d52119a91 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -35,8 +35,8 @@ class Trilinos(CMakePackage): version('xsdk-0.2.0', tag='xsdk-0.2.0') version('develop', branch='develop') version('master', branch='master') - version('12.14.0-rc1', commit='dbf41f3b26b0326a1377f219e6e07eab861d181e') # branch trilinos-release-12-14-branch - version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7', preferred=True) + version('12.14.1', '52a4406cca2241f5eea8e166c2950471dd9478ad6741cbb2a7fc8225814616f0') + version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15') version('12.6.4', 'e11fff717d0e4565779f75a47feecbb2') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 886d5891cd..832ee797f1 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -46,7 +46,7 @@ class Xsdk(Package): depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards', when='@develop') - depends_on('trilinos@12.14.0-rc1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards', + depends_on('trilinos@12.14.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards', when='@0.4.0') depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@0.3.0') -- cgit v1.2.3-70-g09d2