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

edm4hep: allow variant cxxstd 20, sync with podio (#32698)

Browse Source 
Now that `podio` can support `cxxstd` variants 17 and 20, we can allow `edm4hep` to use `cxxstd=20` as well, but must ensure that `edm4hep` uses the same `cxxstd` variant as `podio`. Solution as in `celeritas`.
This commit is contained in:
Wouter Deconinck 2022-09-19 12:51:22 -05:00 committed by GitHub
parent 51d2c05022
commit 0298823e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/edm4hep/package.py
View File

@ -54,10 +54,11 @@ class Edm4hep(CMakePackage):
patch("test-deps.patch", when="@:0.3.2") patch("test-deps.patch", when="@:0.3.2")
_cxxstd_values = ("17", "20")
variant( variant(
"cxxstd", "cxxstd",
default="17", default="17",
values=("17",), values=_cxxstd_values,
multi=False, multi=False,
description="Use the specified C++ standard when building.", description="Use the specified C++ standard when building.",
) )
@ -70,6 +71,9 @@ class Edm4hep(CMakePackage):
depends_on("podio@0.14.1:", when="@0.4.1:") depends_on("podio@0.14.1:", when="@0.4.1:")
depends_on("podio@0.14", when="@0.4") depends_on("podio@0.14", when="@0.4")
depends_on("podio@0.13.0:0.13", when="@:0.3") depends_on("podio@0.13.0:0.13", when="@:0.3")
for _std in _cxxstd_values:
depends_on("podio cxxstd=" + _std, when="cxxstd=" + _std)
depends_on("py-jinja2", type="build") depends_on("py-jinja2", type="build")
depends_on("py-pyyaml", type="build") depends_on("py-pyyaml", type="build")