summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py11
-rw-r--r--var/spack/repos/builtin/packages/xsdk/package.py2
2 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 431ac6f8aa..7ad1eb6ea9 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -180,7 +180,12 @@ class Trilinos(CMakePackage):
git='https://github.com/ornl-cees/DataTransferKit.git',
commit='4fe4d9d56cfd4f8a61f392b81d8efd0e389ee764', # branch dtk-3.0
placement='DataTransferKit',
- when='+dtk')
+ when='+dtk @12.14.0:12.14.99')
+ resource(name='dtk',
+ git='https://github.com/ornl-cees/DataTransferKit.git',
+ branch='master',
+ placement='DataTransferKit',
+ when='+dtk @develop')
resource(name='fortrilinos',
git='https://github.com/trilinos/ForTrilinos.git',
tag='develop',
@@ -239,8 +244,8 @@ class Trilinos(CMakePackage):
conflicts('+dtk', when='~kokkos')
conflicts('+dtk', when='~teuchos')
conflicts('+dtk', when='~tpetra')
- # Only allow DTK-3.0 with Trilinos 12.14
- conflicts('+dtk', when='@0:12.12.99,12.16.0:99,master,develop')
+ # Only allow DTK with Trilinos 12.14 and develop
+ conflicts('+dtk', when='@0:12.12.99,12.16.0:99,master')
conflicts('+fortrilinos', when='~fortran')
conflicts('+fortrilinos', when='@:99')
conflicts('+fortrilinos', when='@master')
diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py
index 34137271c2..886d5891cd 100644
--- a/var/spack/repos/builtin/packages/xsdk/package.py
+++ b/var/spack/repos/builtin/packages/xsdk/package.py
@@ -44,7 +44,7 @@ class Xsdk(Package):
depends_on('superlu-dist@5.2.2', when='@0.3.0')
depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0')
- depends_on('trilinos@master+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')
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',
when='@0.4.0')