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

dd4hep: add v1.17 and a patch for cmake issues (#24274)

Browse Source
This commit is contained in:
Thomas Madlener 2021-06-15 21:52:34 +02:00 committed by GitHub
parent 1bf84d170f
commit d4e04f9410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/dd4hep/cmake_language.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d800190..121fa7fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ ENDIF()
#############################################################
ENABLE_LANGUAGE(CXX)
+ENABLE_LANGUAGE(C)
# Set C++ standard
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used for compiling")

8
var/spack/repos/builtin/packages/dd4hep/package.py
View File

@ -24,6 +24,7 @@ class Dd4hep(CMakePackage):
tags = ['hep'] tags = ['hep']
version('master', branch='master') version('master', branch='master')
version('1.17', sha256='e56071ce5497517fe56af813828b1a5fab90f0b602b86961a277ca22be215232')
version('1.16.1', sha256='c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a') version('1.16.1', sha256='c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a')
version('1.16', sha256='ea9755cd255cf1b058e0e3cd743101ca9ca5ff79f4c60be89f9ba72b1ae5ec69') version('1.16', sha256='ea9755cd255cf1b058e0e3cd743101ca9ca5ff79f4c60be89f9ba72b1ae5ec69')
version('1.15', sha256='992a24bd4b3dfaffecec9d1c09e8cde2c7f89d38756879a47b23208242f4e352') version('1.15', sha256='992a24bd4b3dfaffecec9d1c09e8cde2c7f89d38756879a47b23208242f4e352')
@ -44,6 +45,9 @@ class Dd4hep(CMakePackage):
# See https://github.com/AIDASoft/DD4hep/pull/613 . # See https://github.com/AIDASoft/DD4hep/pull/613 .
patch('tbb-workarounds.patch', when='@1.11') patch('tbb-workarounds.patch', when='@1.11')
patch('tbb2.patch', when='@1.12.1') patch('tbb2.patch', when='@1.12.1')
# Workaround for failing build file generation in some cases
# See https://github.com/spack/spack/issues/24232
patch('cmake_language.patch', when='@:1.17')
variant('xercesc', default=False, description="Enable 'Detector Builders' based on XercesC") variant('xercesc', default=False, description="Enable 'Detector Builders' based on XercesC")
variant('geant4', default=False, description="Enable the simulation part based on Geant4") variant('geant4', default=False, description="Enable the simulation part based on Geant4")
@ -68,6 +72,10 @@ class Dd4hep(CMakePackage):
depends_on('lcio', when="+lcio") depends_on('lcio', when="+lcio")
depends_on('edm4hep', when="+edm4hep") depends_on('edm4hep', when="+edm4hep")
# See https://github.com/AIDASoft/DD4hep/pull/771
conflicts('^cmake@3.16:3.17.0', when='@1.15',
msg='cmake version with buggy FindPython breaks dd4hep cmake config')
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
cxxstd = spec['root'].variants['cxxstd'].value cxxstd = spec['root'].variants['cxxstd'].value