From c45714fd3c27a23d6b28edf6d6071babe5137c0b Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:54:26 +0100 Subject: delphes: use the same C++ standard as in ROOT (#42816) Co-authored-by: jmcarcell --- var/spack/repos/builtin/packages/delphes/package.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/delphes/package.py b/var/spack/repos/builtin/packages/delphes/package.py index 40e790d61f..ccc1258c55 100644 --- a/var/spack/repos/builtin/packages/delphes/package.py +++ b/var/spack/repos/builtin/packages/delphes/package.py @@ -45,23 +45,13 @@ class Delphes(CMakePackage): variant("pythia8", default=True, description="build with pythia8") - variant( - "cxxstd", - default="17", - values=("14", "17"), - multi=False, - description="Use the specified C++ standard when building.", - ) - depends_on("cmake", type="build") - depends_on("root cxxstd=14", when="cxxstd=14") - depends_on("root cxxstd=17", when="cxxstd=17") + depends_on("root") depends_on("pythia8", when="+pythia8") def cmake_args(self): args = [] - # C++ Standard - args.append("-DCMAKE_CXX_STANDARD=%s" % self.spec.variants["cxxstd"].value) + args.append(f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}") return args def setup_run_environment(self, env): -- cgit v1.2.3-70-g09d2