summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorStephen Nicholas Swatman <stephen@v25.nl>2024-08-27 15:05:06 +0200
committerGitHub <noreply@github.com>2024-08-27 08:05:06 -0500
commitcbe18d9cbcaf4ec18b7a3411b918ba9c58c0f7e0 (patch)
tree6ce1bfad6b08ea23544f5107260b57e837519ff5 /var
parent2d83707f844ead6995900d4811c1bf0cc71b31b4 (diff)
downloadspack-cbe18d9cbcaf4ec18b7a3411b918ba9c58c0f7e0.tar.gz
spack-cbe18d9cbcaf4ec18b7a3411b918ba9c58c0f7e0.tar.bz2
spack-cbe18d9cbcaf4ec18b7a3411b918ba9c58c0f7e0.tar.xz
spack-cbe18d9cbcaf4ec18b7a3411b918ba9c58c0f7e0.zip
detray: add version 0.73.0 (#46053)
This commit adds version 0.73.0 of the detray package. As this version drops support for pre-C++20 standards, I had to update the `cxxstd` variant logic.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/detray/package.py28
1 files changed, 19 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/detray/package.py b/var/spack/repos/builtin/packages/detray/package.py
index 6927166ba2..c32e0ec6d5 100644
--- a/var/spack/repos/builtin/packages/detray/package.py
+++ b/var/spack/repos/builtin/packages/detray/package.py
@@ -20,6 +20,7 @@ class Detray(CMakePackage):
license("MPL-2.0", checked_by="stephenswat")
+ version("0.73.0", sha256="f574016bc7515a34a675b577e93316e18cf753f1ab7581dcf1c8271a28cb7406")
version("0.72.1", sha256="6cc8d34bc0d801338e9ab142c4a9884d19d9c02555dbb56972fab86b98d0f75b")
version("0.71.0", sha256="2be2b3dac6f77aa8cea033eba841378dc3703ff93c99e4d05ea03df685e6d508")
version("0.70.0", sha256="14fa1d478d44d5d987caea6f4b365bce870aa8e140c21b802c527afa3a5db869")
@@ -28,13 +29,18 @@ class Detray(CMakePackage):
version("0.67.0", sha256="87b1b29f333c955ea6160f9dda89628490d85a9e5186c2f35f57b322bbe27e18")
variant("csv", default=True, description="Enable the CSV IO plugin")
- variant(
- "cxxstd",
- default="17",
- values=("17", "20", "23"),
- multi=False,
- description="C++ standard used",
+ _cxxstd_values = (
+ conditional("17", when="@:0.72.1"),
+ conditional("20", when="@0.67.0:"),
+ conditional("23", when="@0.67.0:"),
)
+ _cxxstd_common = {
+ "values": _cxxstd_values,
+ "multi": False,
+ "description": "C++ standard used.",
+ }
+ variant("cxxstd", default="17", when="@:0.72.1", **_cxxstd_common)
+ variant("cxxstd", default="20", when="@0.73.0:", **_cxxstd_common)
variant("json", default=True, description="Enable the JSON IO plugin")
variant(
"scalar",
@@ -57,10 +63,14 @@ class Detray(CMakePackage):
depends_on("acts-algebra-plugins +eigen", when="+eigen")
depends_on("acts-algebra-plugins +smatrix", when="+smatrix")
+ # Detray imposes requirements on the C++ standard values used by Algebra
+ # Plugins.
with when("+smatrix"):
- depends_on("acts-algebra-plugins cxxstd=17", when="cxxstd=17")
- depends_on("acts-algebra-plugins cxxstd=20", when="cxxstd=20")
- depends_on("acts-algebra-plugins cxxstd=23", when="cxxstd=23")
+ for _cxxstd in _cxxstd_values:
+ for _v in _cxxstd:
+ depends_on(
+ f"acts-algebra-plugins cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when}"
+ )
depends_on("actsvg +meta")