From ec66e0fb7eccc2f67cda5a2ef9785b2e495ccd28 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Sun, 17 Jun 2018 09:49:27 -0500 Subject: Add changes to the Krell packages with version updates and ranges for the latest release. (#8468) * Add changes to the Krell packages with version updates and ranges for the latest release. * Add reviewer requested changes. Remove preferred clauses and update the qt version for the cbtf-argonavis-gui@develop * Trigger integration/test restart --- var/spack/repos/builtin/packages/cbtf/package.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'var/spack/repos/builtin/packages/cbtf') diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 2845efd446..7a1ac536f5 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -72,25 +72,23 @@ class Cbtf(CMakePackage): variant('build_type', default='None', values=('None'), description='CMake build type') - depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') - depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.66.0", when='@1.9.1.0:') + depends_on("boost@1.66.0", when='@1.9.1.0:9999') depends_on("boost@1.50.0:", when='@develop') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0:') + depends_on("xerces-c@3.1.4:", when='@1.9.1.0:9999') # For XML2 - depends_on("libxml2", when='@develop') - depends_on("libxml2@2.9.4", when='@1.9.1.0:') + depends_on("libxml2") parallel = False -- cgit v1.2.3-60-g2f50