From 7519e4aeec0f23db107ad1daec59d4b6bd5b9277 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Mon, 18 May 2020 13:39:12 +0200 Subject: [PATCH] Add dune-pdelab to the Spack package --- packages/dune/package.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/dune/package.py b/packages/dune/package.py index 72bf25f..0b0492b 100644 --- a/packages/dune/package.py +++ b/packages/dune/package.py @@ -73,6 +73,7 @@ class Dune(CMakePackage): variant('grid', default=True, description='Build with dune-grid module') variant('istl', default=True, description='Build with dune-istl module') variant('localfunctions', default=True, description='Build with dune-localfunctions module') + variant('pdelab', default=False, description='Build with dune-pdelab module') variant('spgrid', default=False, description='Build with dune-spgrid module') variant('testtools', default=False, description='Build with dune-testtools module') variant('typetree', default=False, description='Build with dune-typetree module') @@ -154,14 +155,24 @@ class Dune(CMakePackage): when='@%s+testtools' % vers, ) + # The dune-python package migrated to dune-common after the 2.7 release resource( name='dune-python', git='https://gitlab.dune-project.org/staging/dune-python.git', - branch=branch, + branch='releases/2.7', when='@2.7+python', ) - # Dependencies between modules + # The dune-pdelab package does not yet have a 2.7-compatible release + resource( + name='dune-pdelab', + git='https://gitlab.dune-project.org/pdelab/dune-pdelab.git', + branch='master', + when='@master+pdelab', + ) + + # Dependencies between modules - not necessarily the full set + # as the closure of module dependencies is built later on. module_dependencies = {} module_dependencies["dune-alugrid"] = ["dune-grid", "dune-geometry", "dune-common"] module_dependencies["dune-common"] = [] @@ -170,6 +181,7 @@ class Dune(CMakePackage): module_dependencies["dune-grid"] = ["dune-common", "dune-geometry"] module_dependencies["dune-istl"] = ["dune-common"] module_dependencies["dune-localfunctions"] = ["dune-common", "dune-geometry"] + module_dependencies["dune-pdelab"] = ["dune-common", "dune-grid", "dune-istl", "dune-functions"] module_dependencies["dune-python"] = [] module_dependencies["dune-testtools"] = ["dune-common"] module_dependencies["dune-typetree"] = ["dune-common"] @@ -182,6 +194,7 @@ class Dune(CMakePackage): depends_on('arpack-ng', when='+arpack') depends_on('blas', when='+blas') depends_on('cmake@3.1:', type='build') + depends_on('eigen', when='+pdelab') depends_on('doxygen', type='build', when='+doc') depends_on('gawk') depends_on('gmp', when='+gmp')