From de0d5ba88303ca0d094437b4f3e29ad67af06a37 Mon Sep 17 00:00:00 2001 From: Luke Pickering Date: Thu, 10 Oct 2024 07:40:22 +0100 Subject: [PATCH] `hepmc3`: fix typo in cmake arg for the `+protobuf` variant (#46872) * fix typo in variable name in hepmc3 variant * set cxx standard to 14 when using protobuf * add myself to hepmc3 maintainer list * hepmc3: Applied suggestion of @acecbs for spec.satisfies("+protobuf") (agreed!) Co-authored-by: Alec Scott * hepmc3: cxx_standard for protobuf only set cxx standard to meet protobuf minimum (14) if not also rootio variant as that sets the cxx standard to match the root public API standard requirements --- var/spack/repos/builtin/packages/hepmc3/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/hepmc3/package.py b/var/spack/repos/builtin/packages/hepmc3/package.py index 53ce10eb9a5..52759ac037d 100644 --- a/var/spack/repos/builtin/packages/hepmc3/package.py +++ b/var/spack/repos/builtin/packages/hepmc3/package.py @@ -16,7 +16,7 @@ class Hepmc3(CMakePackage): tags = ["hep"] - maintainers("vvolkl") + maintainers("vvolkl", "luketpickering") license("LGPL-3.0-or-later") @@ -62,7 +62,7 @@ def cmake_args(self): spec = self.spec from_variant = self.define_from_variant args = [ - from_variant("HEPMC3_ENABLE_PROTOBUF", "protobuf"), + from_variant("HEPMC3_ENABLE_PROTOBUFIO", "protobuf"), from_variant("HEPMC3_ENABLE_PYTHON", "python"), from_variant("HEPMC3_ENABLE_ROOTIO", "rootio"), from_variant("HEPMC3_INSTALL_INTERFACES", "interfaces"), @@ -84,5 +84,7 @@ def cmake_args(self): args.append( self.define("HEPMC3_CXX_STANDARD", spec["root"].variants["cxxstd"].value) ) + elif spec.satisfies("+protobuf"): + args.append(self.define("HEPMC3_CXX_STANDARD", "14")) return args