diff options
| author | Thomas Madlener <thomas.madlener@desy.de> | 2021-06-15 21:52:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 13:52:34 -0600 |
| commit | d4e04f94103f1532d4a1bf42e0abc0459cb5633c (patch) | |
| tree | 6ae46d31e89299cd7dfa639c73770b0df662fa68 | |
| parent | 1bf84d170fe92c7295fe2129bcce19d1ec081f5e (diff) | |
| download | spack-d4e04f94103f1532d4a1bf42e0abc0459cb5633c.tar.gz spack-d4e04f94103f1532d4a1bf42e0abc0459cb5633c.tar.bz2 spack-d4e04f94103f1532d4a1bf42e0abc0459cb5633c.tar.xz spack-d4e04f94103f1532d4a1bf42e0abc0459cb5633c.zip | |
dd4hep: add v1.17 and a patch for cmake issues (#24274)
| -rw-r--r-- | var/spack/repos/builtin/packages/dd4hep/cmake_language.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dd4hep/package.py | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/dd4hep/cmake_language.patch b/var/spack/repos/builtin/packages/dd4hep/cmake_language.patch new file mode 100644 index 0000000000..096f4d8050 --- /dev/null +++ b/var/spack/repos/builtin/packages/dd4hep/cmake_language.patch @@ -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") diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index 0047bb3773..0ca1786a16 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -24,6 +24,7 @@ class Dd4hep(CMakePackage): tags = ['hep'] version('master', branch='master') + version('1.17', sha256='e56071ce5497517fe56af813828b1a5fab90f0b602b86961a277ca22be215232') version('1.16.1', sha256='c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a') version('1.16', sha256='ea9755cd255cf1b058e0e3cd743101ca9ca5ff79f4c60be89f9ba72b1ae5ec69') version('1.15', sha256='992a24bd4b3dfaffecec9d1c09e8cde2c7f89d38756879a47b23208242f4e352') @@ -44,6 +45,9 @@ class Dd4hep(CMakePackage): # See https://github.com/AIDASoft/DD4hep/pull/613 . patch('tbb-workarounds.patch', when='@1.11') 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('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('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): spec = self.spec cxxstd = spec['root'].variants['cxxstd'].value |