diff options
| author | Hadrien G <knights_of_ni@gmx.com> | 2020-02-12 02:38:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 17:38:22 -0800 |
| commit | c8cb480eb7ac18c6c5b9c3b73841b00ecfa0ed56 (patch) | |
| tree | 8d4f136cd85dd49c9a68691b744a21d452b89966 | |
| parent | cf120d7441b7c7a2d7c09d27ef51bcfb5b526a9d (diff) | |
| download | spack-c8cb480eb7ac18c6c5b9c3b73841b00ecfa0ed56.tar.gz spack-c8cb480eb7ac18c6c5b9c3b73841b00ecfa0ed56.tar.bz2 spack-c8cb480eb7ac18c6c5b9c3b73841b00ecfa0ed56.tar.xz spack-c8cb480eb7ac18c6c5b9c3b73841b00ecfa0ed56.zip | |
ROOT: Add Pythia8 support (#14790)
| -rw-r--r-- | var/spack/repos/builtin/packages/root/README.md | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/root/README.md b/var/spack/repos/builtin/packages/root/README.md index d808498b34..5f9180dc95 100644 --- a/var/spack/repos/builtin/packages/root/README.md +++ b/var/spack/repos/builtin/packages/root/README.md @@ -30,8 +30,6 @@ Monitoring with Monalisa depends on `libapmoncpp`. #### `oracle` -#### `pythia8` - #### `tcmalloc` #### `veccore` diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index a3c9202833..598fd78dd9 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -117,6 +117,8 @@ class Root(CMakePackage): description='Enable postgres support') variant('pythia6', default=False, description='Enable pythia6 support') + variant('pythia8', default=False, + description='Enable pythia8 support') variant('python', default=True, description='Enable Python ROOT bindings') variant('qt4', default=False, @@ -216,6 +218,7 @@ class Root(CMakePackage): depends_on('openssl', when='+davix') # Also with davix depends_on('postgresql', when='+postgres') depends_on('pythia6+root', when='+pythia6') + depends_on('pythia8', when='+pythia8') depends_on('python@2.7:', when='+python', type=('build', 'run')) depends_on('r', when='+r', type=('build', 'run')) depends_on('r-rcpp', when='+r', type=('build', 'run')) @@ -361,8 +364,8 @@ class Root(CMakePackage): ['oracle', False], ['pgsql', 'postgres'], ['pythia6'], - ['pythia8', False], - ['python', self.spec.satisfies('+python')], + ['pythia8'], + ['python'], ['qt', 'qt4'], # See conflicts ['qtgsi', 'qt4'], # See conflicts ['r', 'R'], |