summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/gaudi/package.py1
-rw-r--r--var/spack/repos/builtin/packages/lcio/package.py2
-rw-r--r--var/spack/repos/builtin/packages/whizard/package.py5
3 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py
index 0c44036dc6..cea1b046da 100644
--- a/var/spack/repos/builtin/packages/gaudi/package.py
+++ b/var/spack/repos/builtin/packages/gaudi/package.py
@@ -16,6 +16,7 @@ class Gaudi(CMakePackage):
version('master', branch='master')
# major cmake config overhaul already in use by some
version('develop', git='https://gitlab.cern.ch/clemenci/Gaudi.git', branch='cmake-modernisation')
+ version('34.0', sha256='28fc4abb5a6b08da5a6b1300451c7e8487f918b055939877219d454abf7668ae')
version('33.2', sha256='26aaf9c4ff237a60ec79af9bd18ad249fc91c16e297ba77e28e4a256123db6e5')
version('33.1', sha256='7eb6b2af64aeb965228d4b6ea66c7f9f57f832f93d5b8ad55c9105235af5b042')
version('33.0', sha256='76a967c41f579acc432593d498875dd4dc1f8afd5061e692741a355a9cf233c8')
diff --git a/var/spack/repos/builtin/packages/lcio/package.py b/var/spack/repos/builtin/packages/lcio/package.py
index c6ca4f6a95..4319774b15 100644
--- a/var/spack/repos/builtin/packages/lcio/package.py
+++ b/var/spack/repos/builtin/packages/lcio/package.py
@@ -17,6 +17,7 @@ class Lcio(CMakePackage):
maintainers = ['gaede', 'vvolkl']
version('master', branch='master')
+ version('2.14.2', sha256='e64f4bf932edf6d6cdaf0162e5104f8fbf3e5fd9737c7a080c48859009621919')
version('2.13.3', sha256='35aaa7989be33574a7c44ea7e6d7780ab26ef8bd4aa29d495f3831a3cd269304')
version('2.13.2', sha256='9f153ba13e56ee16795378f9192678d40df1faca51d00aaa8fb80547bfecb8d8')
@@ -36,6 +37,7 @@ class Lcio(CMakePackage):
depends_on('openjdk', when="+jar")
# build error with +termlib, to be investigated
depends_on('ncurses~termlib', when="+examples")
+ depends_on('delphes', when="+examples")
depends_on('readline', when="+examples")
def cmake_args(self):
diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py
index 1fcb556d86..d38994c67e 100644
--- a/var/spack/repos/builtin/packages/whizard/package.py
+++ b/var/spack/repos/builtin/packages/whizard/package.py
@@ -88,7 +88,6 @@ class Whizard(AutotoolsPackage):
'--enable-lhapdf=%s' % ("yes" if "+lhapdf" in spec else "no"),
'--enable-openloops=%s' % ("yes" if "+openloops" in spec
else "no"),
- '--with-openloops=%s' % spec['openloops'].prefix,
# todo: hoppet
# todo: recola
# todo: looptools
@@ -96,14 +95,14 @@ class Whizard(AutotoolsPackage):
# todo: pythia6
]
+ if "+openloops" in spec:
+ args.append('--with-openloops=%s' % spec['openloops'].prefix)
if "+lcio" in spec:
args.append('--with-lcio=%s' % spec['lcio'].prefix)
-
if "hepmc=3" in spec:
args.append('--with-hepmc=%s' % spec['hepmc3'].prefix)
if "hepmc=2" in spec:
args.append('--with-hepmc=%s' % spec['hepmc'].prefix)
-
if "+openmp" not in spec:
args.append('--disable-openmp')
return args