summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorChuck Atkins <chuck.atkins@kitware.com>2021-03-12 14:37:43 -0500
committerGitHub <noreply@github.com>2021-03-12 11:37:43 -0800
commit474e616a5be74390bcff96888c9b6cc2bfcfba85 (patch)
tree25c77ee75a081f24b1075651f333fd1e7a337065 /var
parentcf29ee6b2b8cb11e87908144aaf3289c63be1242 (diff)
downloadspack-474e616a5be74390bcff96888c9b6cc2bfcfba85.tar.gz
spack-474e616a5be74390bcff96888c9b6cc2bfcfba85.tar.bz2
spack-474e616a5be74390bcff96888c9b6cc2bfcfba85.tar.xz
spack-474e616a5be74390bcff96888c9b6cc2bfcfba85.zip
ascent: Relax CMake version constraints (#22253)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/ascent/package.py5
-rw-r--r--var/spack/repos/builtin/packages/vtk-h/package.py5
2 files changed, 4 insertions, 6 deletions
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")