diff options
| author | Chris Richardson <chris@bpi.cam.ac.uk> | 2021-10-01 20:05:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 12:05:19 -0700 |
| commit | bce269df1377711e891760fe21b008aac0dea2b0 (patch) | |
| tree | ddf02c2c8216b5687c2bf167c8223a6b52c333f0 /var | |
| parent | 18760de972c1af92a88fecc4b36a4ecf001821cf (diff) | |
| download | spack-bce269df1377711e891760fe21b008aac0dea2b0.tar.gz spack-bce269df1377711e891760fe21b008aac0dea2b0.tar.bz2 spack-bce269df1377711e891760fe21b008aac0dea2b0.tar.xz spack-bce269df1377711e891760fe21b008aac0dea2b0.zip | |
Fenicsx update dependency and build for main branch (#25864)
* Updates to make it work again for main
* Use property
Co-authored-by: Chris <cnr12@cam.ac.uk>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/fenics-basix/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-fenics-ffcx/package.py | 2 |
2 files changed, 7 insertions, 1 deletions
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') |