zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fenicsx update dependency and build for main branch (#25864)

Browse Source 
* Updates to make it work again for main
* Use property

Co-authored-by: Chris <cnr12@cam.ac.uk>
This commit is contained in:
Chris Richardson 2021-10-01 20:05:19 +01:00 committed by GitHub
parent 18760de972
commit bce269df13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/fenics-basix/package.py
View File

@ -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

2
var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
View File

@ -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')