From 474e616a5be74390bcff96888c9b6cc2bfcfba85 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Fri, 12 Mar 2021 14:37:43 -0500 Subject: ascent: Relax CMake version constraints (#22253) --- var/spack/repos/builtin/packages/ascent/package.py | 5 ++--- var/spack/repos/builtin/packages/vtk-h/package.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 51da6ea5f7..a8b3e6491e 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -82,9 +82,8 @@ class Ascent(Package, CudaPackage): # package dependencies ########################################################################### - # use cmake 3.14, newest that provides proper cuda support - # and we have seen errors with cuda in 3.15 - depends_on("cmake@3.14.1:3.14.99", type='build') + # Certain CMake versions have been found to break for our use cases + depends_on("cmake@3.14.1:3.14.99,3.18.2:", type='build') depends_on("conduit~python", when="~python") depends_on("conduit+python", when="+python+shared") depends_on("conduit~shared~python", when="~shared") diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 6386dd9073..91afd9f7fc 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -63,9 +63,8 @@ class VtkH(Package, CudaPackage): variant("logging", default=False, description="Build vtk-h with logging enabled") variant("contourtree", default=False, description="Enable contour tree support") - # use cmake 3.14, newest that provides proper cuda support - # and we have seen errors with cuda in 3.15 - depends_on("cmake@3.14.1:3.14.99", type='build') + # Certain CMake versions have been found to break for our use cases + depends_on("cmake@3.14.1:3.14.99,3.18.2", type='build') depends_on("mpi", when="+mpi") depends_on("cuda", when="+cuda") -- cgit v1.2.3-70-g09d2