From 0298823e289b349f95b1e853c22e61ab26b8df0c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 19 Sep 2022 12:51:22 -0500 Subject: edm4hep: allow variant cxxstd 20, sync with podio (#32698) 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`. --- var/spack/repos/builtin/packages/edm4hep/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py index d0ab83ad6d..32767f4582 100644 --- a/var/spack/repos/builtin/packages/edm4hep/package.py +++ b/var/spack/repos/builtin/packages/edm4hep/package.py @@ -54,10 +54,11 @@ class Edm4hep(CMakePackage): patch("test-deps.patch", when="@:0.3.2") + _cxxstd_values = ("17", "20") variant( "cxxstd", default="17", - values=("17",), + values=_cxxstd_values, multi=False, 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", when="@0.4") 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-pyyaml", type="build") -- cgit v1.2.3-70-g09d2