From d2ad58c476cd992201c4efad9eb51fa7def6250d Mon Sep 17 00:00:00 2001 From: Sam Reeve <6740307+streeve@users.noreply.github.com> Date: Fri, 29 Jul 2022 18:02:00 -0400 Subject: cabana: new version 0.5 (#31807) --- var/spack/repos/builtin/packages/cabana/package.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index d96f81beef..a4aae73e9d 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -12,13 +12,14 @@ class Cabana(CMakePackage): """ homepage = "https://github.com/ECP-copa/Cabana" git = "https://github.com/ECP-copa/Cabana.git" - url = "https://github.com/ECP-copa/Cabana/archive/0.4.0.tar.gz" + url = "https://github.com/ECP-copa/Cabana/archive/0.5.0.tar.gz" maintainers = ["junghans", "streeve", "sslattery"] tags = ['e4s', 'ecp'] version('master', branch='master') + version('0.5.0', sha256='b7579d44e106d764d82b0539285385d28f7bbb911a572efd05c711b28b85d8b1') version('0.4.0', sha256='c347d23dc4a5204f9cc5906ccf3454f0b0b1612351bbe0d1c58b14cddde81e85') version('0.3.0', sha256='fb67ab9aaf254b103ae0eb5cc913ddae3bf3cd0cf6010e9686e577a2981ca84f') version('0.2.0', sha256='3e0c0e224e90f4997f6c7e2b92f00ffa18f8bcff72f789e0908cea0828afc2cb') @@ -40,12 +41,14 @@ class Cabana(CMakePackage): variant('examples', default=False, description='Build tutorial examples') variant('performance_testing', default=False, description='Build performance tests') - depends_on("cmake@3.9:", type='build') - depends_on("googletest", type='build') + depends_on("cmake@3.9:", type='build', when="@:0.4.0") + depends_on("cmake@3.16:", type='build', when="@0.5.0:") + depends_on("googletest", type='build', when="testing") _versions = { ":0.2.0": "-legacy", "0.3.0": "@3.1:", - "0.4.0": "@3.2:" + "0.4.0": "@3.2:", + "0.5.0": "@3.2:" } for _version in _versions: _kk_version = _versions[_version] @@ -60,13 +63,11 @@ class Cabana(CMakePackage): depends_on(_kk_spec, when='@{0}+{1}'.format(_version, _backend)) depends_on("arborx", when="@0.3.0:+arborx") depends_on("hypre-cmake@2.22.0:", when="@0.4.0:+hypre") - depends_on("hypre-cmake@2.22.1:", when="@master+hypre") - # Heffte pinned at 2.0.0 for now because its cmakefiles can't roll forward - # compatibilty from 2.0.0 to later minor versions and cabana cmakefiles are - # currently requesting version 2.0.0. Will be fixed for later cabana versions - # as cabana requested version number and heffte version compatibility changes + depends_on("hypre-cmake@2.22.1:", when="@0.5.0:+hypre") + # Heffte pinned at 2.x.0 because its cmakefiles can't roll forward + # compatibilty to later minor versions. depends_on("heffte@2.0.0", when="@0.4.0+heffte") - depends_on("heffte@2.1.0", when="@master+heffte") + depends_on("heffte@2.1.0", when="@0.5.0:+heffte") depends_on('mpi', when='+mpi') conflicts("+cajita ~mpi") -- cgit v1.2.3-70-g09d2