summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvvolkl <valentin.volkl@cern.ch>2020-08-04 19:11:13 +0200
committerGitHub <noreply@github.com>2020-08-04 12:11:13 -0500
commit9d2b60ac0c17db76c32ca30949e0649788c702cf (patch)
tree7465d0d20c03f83b81febdbcb8d3f0abc22ec8b4
parentb85cc363c1df9be6e79f6f255c151b2e537cb365 (diff)
downloadspack-9d2b60ac0c17db76c32ca30949e0649788c702cf.tar.gz
spack-9d2b60ac0c17db76c32ca30949e0649788c702cf.tar.bz2
spack-9d2b60ac0c17db76c32ca30949e0649788c702cf.tar.xz
spack-9d2b60ac0c17db76c32ca30949e0649788c702cf.zip
[delphes] pythia8 variant and cleanup (#17664)
* [delphes] new version * [delphes] pythia8 variant * [delphes] flake8
-rw-r--r--var/spack/repos/builtin/packages/delphes/package.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/delphes/package.py b/var/spack/repos/builtin/packages/delphes/package.py
index b3b511a00f..5c37df8684 100644
--- a/var/spack/repos/builtin/packages/delphes/package.py
+++ b/var/spack/repos/builtin/packages/delphes/package.py
@@ -18,7 +18,8 @@ class Delphes(CMakePackage):
maintainers = ['drbenmorgan', 'vvolkl', 'selvaggi']
version('master', branch='master')
- version('3.4.2', sha256='d46a7c5474de650befdb89377115feee31f1743107ceb3d8da699be9d48c097b')
+ version('3.4.3pre04', tag='3.4.3pre04')
+ version('3.4.2', sha256='d46a7c5474de650befdb89377115feee31f1743107ceb3d8da699be9d48c097b', preferred=True)
version('3.4.1', sha256='4b5a2aeac326643f45b6d45c39ba2302e323eeb86d8cb58843c6e73949b1208a')
version('3.4.0', sha256='c0f9500663a0c3a5c1eddcee598a67b5bcfc9318303195c6cacc0590b4023fa1')
version('3.3.3', sha256='404de818a6b7852b01187ccf598d8ac19d308b9361f128751ef003cde248ff00')
@@ -38,13 +39,8 @@ class Delphes(CMakePackage):
version('3.0.6', sha256='9e225731d57d2a76d35886841f8eff121bb3a45560b16077bd8c351151581d88')
version('3.0.5', sha256='ab64ec6d2476fbfa40562e7edb510a8ab4c4fe5be77a4353ebf315c2af181a80')
- depends_on('cmake', type='build')
- depends_on('root cxxstd=14', when='cxxstd=14')
- depends_on('root cxxstd=17', when='cxxstd=17')
-
- variant('build_type', default='Release',
- description='The build type to build',
- values=('Debug', 'Release'))
+ variant('pythia8', default=True,
+ description="build with pythia8")
variant('cxxstd',
default='17',
@@ -52,6 +48,11 @@ class Delphes(CMakePackage):
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('pythia8', when="+pythia8")
+
def cmake_args(self):
args = []
# C++ Standard