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

FEniCSx: fix CMake root directory and dependency versions (#26445)

Browse Source
This commit is contained in:
Garth N. Wells 2021-10-04 08:20:53 +01:00 committed by GitHub
parent 44d7218038
commit baa50c6679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,11 @@ class FenicsBasix(CMakePackage):
depends_on("cmake@3.18:", type="build")
depends_on("xtl@0.7.2:")
depends_on("xtensor@0.23.10:")
depends_on("blas", type=("build", "run"))
depends_on("blas")
depends_on("lapack")
@property
def root_cmake_lists_dir(self):
def root_cmakelists_dir(self):
if self.spec.satisfies("@main"):
return "cpp"
return None
return self.stage.source_path

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

@ -12,7 +12,7 @@ class FenicsDolfinx(CMakePackage):
homepage = "https://github.com/FEniCS/dolfinx"
git = "https://github.com/FEniCS/dolfinx.git"
url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz"
maintainers = ["js947", "chrisrichardson", "garth-wells"]
maintainers = ["chrisrichardson", "garth-wells", "nate-sime"]
version("main", branch="main")
version("0.3.0", sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed")

4
var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
View File

@ -13,7 +13,7 @@ class PyFenicsDolfinx(PythonPackage):
homepage = "https://github.com/FEniCS/dolfinx"
url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz"
git = "https://github.com/FEniCS/dolfinx.git"
maintainers = ["js947", "chrisrichardson", "garth-wells"]
maintainers = ["chrisrichardson", "garth-wells", "nate-sime"]
version("main", branch="main")
version("0.3.0", sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed")
@ -44,7 +44,7 @@ class PyFenicsDolfinx(PythonPackage):
depends_on("py-fenics-ffcx@0.2.0", type="run", when="@0.2.0")
depends_on("py-fenics-ffcx@0.1.0", type="run", when="@0.1.0")
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.3.99")
depends_on("py-cffi", type="run")
depends_on("py-numpy", type="run")