summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Rood <jon.rood@nrel.gov>2017-10-30 22:48:21 -0600
committerChristoph Junghans <christoph.junghans@gmail.com>2017-10-30 22:48:21 -0600
commit50d932d9f129aa807dec510b37847a7f9672a1e7 (patch)
tree46b90fb6fbec08f4951ed71f30966f6b2866334f
parentf5863d6708c068ef5343908708a07cf10053e17c (diff)
downloadspack-50d932d9f129aa807dec510b37847a7f9672a1e7.tar.gz
spack-50d932d9f129aa807dec510b37847a7f9672a1e7.tar.bz2
spack-50d932d9f129aa807dec510b37847a7f9672a1e7.tar.xz
spack-50d932d9f129aa807dec510b37847a7f9672a1e7.zip
Merging netcdf dependency lines in trilinos into one line for better coverage. (#5990)
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index ce3d092b40..a63e6208db 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -202,8 +202,7 @@ class Trilinos(CMakePackage):
# MPI related dependencies
depends_on('mpi')
depends_on('netcdf+mpi', when="~pnetcdf")
- depends_on('netcdf+mpi+parallel-netcdf', when="+pnetcdf@master")
- depends_on('netcdf+mpi+parallel-netcdf', when="+pnetcdf@12.10.2:")
+ depends_on('netcdf+mpi+parallel-netcdf', when="+pnetcdf@master,12.12.1:")
depends_on('parmetis', when='+metis')
# Trilinos' Tribits config system is limited which makes it very tricky to
# link Amesos with static MUMPS, see