zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ROOT: Add Pythia8 support (#14790)

Browse Source
This commit is contained in:
Hadrien G 2020-02-12 02:38:22 +01:00 committed by GitHub
parent cf120d7441
commit c8cb480eb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/root/README.md
View File

@ -30,8 +30,6 @@ Monitoring with Monalisa depends on `libapmoncpp`.
#### `oracle` #### `oracle`
#### `pythia8`
#### `tcmalloc` #### `tcmalloc`
#### `veccore` #### `veccore`

7
var/spack/repos/builtin/packages/root/package.py
View File

@ -117,6 +117,8 @@ class Root(CMakePackage):
description='Enable postgres support') description='Enable postgres support')
variant('pythia6', default=False, variant('pythia6', default=False,
description='Enable pythia6 support') description='Enable pythia6 support')
variant('pythia8', default=False,
description='Enable pythia8 support')
variant('python', default=True, variant('python', default=True,
description='Enable Python ROOT bindings') description='Enable Python ROOT bindings')
variant('qt4', default=False, variant('qt4', default=False,
@ -216,6 +218,7 @@ class Root(CMakePackage):
depends_on('openssl', when='+davix') # Also with davix depends_on('openssl', when='+davix') # Also with davix
depends_on('postgresql', when='+postgres') depends_on('postgresql', when='+postgres')
depends_on('pythia6+root', when='+pythia6') depends_on('pythia6+root', when='+pythia6')
depends_on('pythia8', when='+pythia8')
depends_on('python@2.7:', when='+python', type=('build', 'run')) depends_on('python@2.7:', when='+python', type=('build', 'run'))
depends_on('r', when='+r', type=('build', 'run')) depends_on('r', when='+r', type=('build', 'run'))
depends_on('r-rcpp', when='+r', type=('build', 'run')) depends_on('r-rcpp', when='+r', type=('build', 'run'))
@ -361,8 +364,8 @@ def cmake_args(self):
['oracle', False], ['oracle', False],
['pgsql', 'postgres'], ['pgsql', 'postgres'],
['pythia6'], ['pythia6'],
['pythia8', False], ['pythia8'],
['python', self.spec.satisfies('+python')], ['python'],
['qt', 'qt4'], # See conflicts ['qt', 'qt4'], # See conflicts
['qtgsi', 'qt4'], # See conflicts ['qtgsi', 'qt4'], # See conflicts
['r', 'R'], ['r', 'R'],