From 46cae921b96b2b3cfaa31149cf880c35ffb34faf Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 11 Oct 2020 14:27:54 -0400 Subject: Update datatransferkit (#19239) Conflicts: var/spack/repos/builtin/packages/datatransferkit/package.py var/spack/repos/builtin/packages/xsdk/package.py --- var/spack/repos/builtin/packages/datatransferkit/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/datatransferkit/package.py b/var/spack/repos/builtin/packages/datatransferkit/package.py index 959d5b5093..ff30d1fa38 100644 --- a/var/spack/repos/builtin/packages/datatransferkit/package.py +++ b/var/spack/repos/builtin/packages/datatransferkit/package.py @@ -11,12 +11,13 @@ class Datatransferkit(CMakePackage): parallel solution transfer services for multiphysics simulations""" homepage = "https://datatransferkit.readthedoc.io" - url = "https://github.com/ORNL-CEES/DataTransferKit/archive/3.1-rc1.tar.gz" + url = "https://github.com/ORNL-CEES/DataTransferKit/archive/3.1-rc2.tar.gz" git = "https://github.com/ORNL-CEES/DataTransferKit.git" maintainers = ['Rombur'] version('master', branch='master', submodules=True) + version('3.1-rc2', branch='3.1-rc2', submodules=True) variant('openmp', default=False, description='enable OpenMP backend') variant('serial', default=True, description='enable Serial backend (default)') @@ -24,8 +25,10 @@ class Datatransferkit(CMakePackage): description='enable the build of shared lib') depends_on('cmake', type='build') - depends_on('trilinos@develop+intrepid2+shards~dtk', when='+serial') - depends_on('trilinos@develop+intrepid2+shards+openmp~dtk', when='+openmp') + depends_on('trilinos+intrepid2+shards~dtk', when='+serial') + depends_on('trilinos+intrepid2+shards+openmp~dtk', when='+openmp') + depends_on('trilinos+stratimikos+belos', when='@master') + depends_on('trilinos@13:13.99', when='@3.1-rc2') def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2