From 9583bde7390473918358b057f50a5b259aca6af2 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Wed, 18 Dec 2019 16:32:23 +0100 Subject: Add new DD4hep release and some forgotten build requirements (#14195) * Add new DD4hep release and some forgotten build requirements * PR review suggestions Use master naming convention for development branch, and put versions in decreasing order. --- var/spack/repos/builtin/packages/dd4hep/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index 0f0788247f..b63fa088b9 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -18,16 +18,18 @@ class Dd4hep(CMakePackage): homepage = "https://dd4hep.web.cern.ch/dd4hep/" git = "https://github.com/AIDASoft/DD4hep.git" - version('develop', branch='master') - version('1.10.0', commit='9835d1813c07d9d5850d1e68276c0171d1726801') + version('master', branch='master') + version('1.11.0', commit='280c7d748d56a704699408ac8e57815d029b169a') + version('1.10.0', commit='9835d1813c07d9d5850d1e68276c0171d1726801') variant('xercesc', default=False, description="Enable 'Detector Builders' based on XercesC") variant('geant4', default=False, description="Enable the simulation part based on Geant4") variant('testing', default=False, description="Enable and build tests") - depends_on('cmake @3.3:', type='build') - depends_on('root @6.08: +gdml +opengl +x') + depends_on('cmake @3.12:', type='build') depends_on('boost @1.49:') + depends_on('root @6.08: +gdml +math +opengl +python +x') + depends_on('python') depends_on('xerces-c', when='+xercesc') depends_on('geant4@10.2.2:', when='+geant4') -- cgit v1.2.3-60-g2f50