Skip to content
Snippets Groups Projects
Unverified Commit f8da8dbd authored by Satish Balay's avatar Satish Balay Committed by GitHub
Browse files

Trilinos: add release 12.14.1 (#10740)

xsdk: switch from 12.14.0-rc1 to 12.14.1
parent 617c1a37
Branches
Tags
No related merge requests found
...@@ -35,8 +35,8 @@ class Trilinos(CMakePackage): ...@@ -35,8 +35,8 @@ class Trilinos(CMakePackage):
version('xsdk-0.2.0', tag='xsdk-0.2.0') version('xsdk-0.2.0', tag='xsdk-0.2.0')
version('develop', branch='develop') version('develop', branch='develop')
version('master', branch='master') version('master', branch='master')
version('12.14.0-rc1', commit='dbf41f3b26b0326a1377f219e6e07eab861d181e') # branch trilinos-release-12-14-branch version('12.14.1', '52a4406cca2241f5eea8e166c2950471dd9478ad6741cbb2a7fc8225814616f0')
version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7', preferred=True) version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7')
version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810')
version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15') version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15')
version('12.6.4', 'e11fff717d0e4565779f75a47feecbb2') version('12.6.4', 'e11fff717d0e4565779f75a47feecbb2')
......
...@@ -46,7 +46,7 @@ class Xsdk(Package): ...@@ -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', depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards',
when='@develop') 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') when='@0.4.0')
depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus',
when='@0.3.0') when='@0.3.0')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment