From bce269df1377711e891760fe21b008aac0dea2b0 Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Fri, 1 Oct 2021 20:05:19 +0100 Subject: Fenicsx update dependency and build for main branch (#25864) * Updates to make it work again for main * Use property Co-authored-by: Chris --- var/spack/repos/builtin/packages/fenics-basix/package.py | 6 ++++++ var/spack/repos/builtin/packages/py-fenics-ffcx/package.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py index e86d653a59..deaa45dd7b 100644 --- a/var/spack/repos/builtin/packages/fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -23,3 +23,9 @@ class FenicsBasix(CMakePackage): depends_on("xtl@0.7.2:") depends_on("xtensor@0.23.10:") depends_on("blas", type=("build", "run")) + + @property + def root_cmake_lists_dir(self): + if self.spec.satisfies("@main"): + return "cpp" + return None diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index 8220ce2c53..ab95f7ec12 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -24,7 +24,7 @@ class PyFenicsFfcx(PythonPackage): depends_on('py-cffi', type='run') depends_on('py-fenics-ufl@main', type='run', when='@main') - depends_on('py-fenics-ufl@2021.1.0', type='run', when='@0.1:') + depends_on('py-fenics-ufl@2021.1.0', type='run', when='@0.1.0:0.3.99') depends_on('py-fenics-basix@main', type='run', when='@main') depends_on('py-fenics-basix@0.3.0', type='run', when='@0.3.0') -- cgit v1.2.3-60-g2f50