diff options
| author | Thomas Madlener <thomas.madlener@desy.de> | 2024-09-24 15:56:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 15:56:21 +0200 |
| commit | 5d9c534018593fdef5db1028c60026d26bf4d65b (patch) | |
| tree | beb04c1897675d2f234a17c6ae1a3e147f755de6 /var | |
| parent | 8471b1b471b26fc6e5f27a4d61188f4742cc84a3 (diff) | |
| download | spack-5d9c534018593fdef5db1028c60026d26bf4d65b.tar.gz spack-5d9c534018593fdef5db1028c60026d26bf4d65b.tar.bz2 spack-5d9c534018593fdef5db1028c60026d26bf4d65b.tar.xz spack-5d9c534018593fdef5db1028c60026d26bf4d65b.zip | |
podio: add version 1.1, edm4hep: add version 0.99.1 (#46502)
* podio: Add tag for 1.1
* edm4hep: Add 0.99.1 tag and update c++ standards
* Avoid repetition of cxxstd values
* Remove stray assert from developing
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/edm4hep/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/podio/package.py | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py index b795086353..ddf72870eb 100644 --- a/var/spack/repos/builtin/packages/edm4hep/package.py +++ b/var/spack/repos/builtin/packages/edm4hep/package.py @@ -21,6 +21,7 @@ class Edm4hep(CMakePackage): license("Apache-2.0") version("main", branch="main") + version("0.99.1", sha256="84d990f09dbd0ad2198596c0c51238a4b15391f51febfb15dd3d191dc7aae9f4") version("0.99", sha256="3636e8c14474237029bf1a8be11c53b57ad3ed438fd70a7e9b87c5d08f1f2ea6") version("0.10.5", sha256="003c8e0c8e1d1844592d43d41384f4320586fbfa51d4d728ae0870b9c4f78d81") version( @@ -51,10 +52,10 @@ class Edm4hep(CMakePackage): depends_on("cxx", type="build") # generated - _cxxstd_values = ("17", "20") + _cxxstd_values = (conditional("17", when="@:0.99.0"), conditional("20")) variant( "cxxstd", - default="17", + default="20", values=_cxxstd_values, multi=False, description="Use the specified C++ standard when building.", @@ -69,7 +70,8 @@ class Edm4hep(CMakePackage): depends_on("podio@1:", when="@0.99:") depends_on("podio@0.15:", when="@:0.10.5") for _std in _cxxstd_values: - depends_on("podio cxxstd=" + _std, when="cxxstd=" + _std) + for _v in _std: + depends_on(f"podio cxxstd={_v.value}", when=f"cxxstd={_v.value}") depends_on("py-jinja2", type="build") depends_on("py-pyyaml", type="build") diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index a4c00ce226..8b76e75f99 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -20,6 +20,7 @@ class Podio(CMakePackage): tags = ["hep", "key4hep"] version("master", branch="master") + version("1.1", sha256="2cb5040761f3da4383e1f126da25d68e99ecd8398e0ff12e7475a3745a7030a6") version("1.0.1", sha256="915531a2bcf638011bb6cc19715bbc46d846ec8b985555a1afdcd6abc017e21b") version("1.0", sha256="491f335e148708e387e90e955a6150e1fc2e01bf6b4980b65e257ab0619559a9") version("0.99", sha256="c823918a6ec1365d316e0a753feb9d492e28903141dd124a1be06efac7c1877a") |