From f0658243c06119f6d0bf9bf72b162bb7be129344 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 5 Sep 2023 05:06:50 -0500 Subject: clhep: support variant cxxstd=20 (#39768) --- var/spack/repos/builtin/packages/clhep/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 6089a53054..43165ef8b7 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -53,13 +53,16 @@ class Clhep(CMakePackage): variant( "cxxstd", default="11", - values=("11", "14", "17"), + values=( + "11", + "14", + conditional("17", when="@2.3.4.3:"), + conditional("20", when="@2.4.6.4:"), + ), multi=False, description="Use the specified C++ standard when building.", ) - conflicts("cxxstd=17", when="@:2.3.4.2") - depends_on("cmake@2.8.12.2:", when="@2.2.0.4:2.3.0.0", type="build") depends_on("cmake@3.2:", when="@2.3.0.1:", type="build") -- cgit v1.2.3-70-g09d2