summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>2024-02-27 09:54:26 +0100
committerGitHub <noreply@github.com>2024-02-27 09:54:26 +0100
commitc45714fd3c27a23d6b28edf6d6071babe5137c0b (patch)
treea5789191955e183c8df3cec2f24739aa67b0d997
parent523d12d9a8ee3bf9e77ce6a8d7274cf3a0f0b295 (diff)
downloadspack-c45714fd3c27a23d6b28edf6d6071babe5137c0b.tar.gz
spack-c45714fd3c27a23d6b28edf6d6071babe5137c0b.tar.bz2
spack-c45714fd3c27a23d6b28edf6d6071babe5137c0b.tar.xz
spack-c45714fd3c27a23d6b28edf6d6071babe5137c0b.zip
delphes: use the same C++ standard as in ROOT (#42816)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
-rw-r--r--var/spack/repos/builtin/packages/delphes/package.py14
1 files changed, 2 insertions, 12 deletions
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):