summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2023-09-05 05:06:50 -0500
committerGitHub <noreply@github.com>2023-09-05 12:06:50 +0200
commitf0658243c06119f6d0bf9bf72b162bb7be129344 (patch)
treed826666f5d03f123fb326c64de362c09d16b7d4e
parent06b6b05dbd0ee60616a492aa31100c6c4d53c10c (diff)
downloadspack-f0658243c06119f6d0bf9bf72b162bb7be129344.tar.gz
spack-f0658243c06119f6d0bf9bf72b162bb7be129344.tar.bz2
spack-f0658243c06119f6d0bf9bf72b162bb7be129344.tar.xz
spack-f0658243c06119f6d0bf9bf72b162bb7be129344.zip
clhep: support variant cxxstd=20 (#39768)
-rw-r--r--var/spack/repos/builtin/packages/clhep/package.py9
1 files 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")