hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[dd4hep] fix assimp variant (#21226)

Browse source
This commit is contained in:
vvolkl 2021-01-26 08:57:13 +01:00 committed by GitHub
parent eb60c858a0
commit b45a31aefe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/assimp/package.py
View file

@ -12,7 +12,9 @@ class Assimp(CMakePackage):
homepage = "https://www.assimp.org"
url = "https://github.com/assimp/assimp/archive/v4.0.1.tar.gz"
git = "https://github.com/assimp/assimp.git"
version('master', branch='master')
version('5.0.1', sha256='11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc')
version('4.0.1', sha256='60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e')

11
var/spack/repos/builtin/packages/dd4hep/package.py
View file

@ -49,7 +49,9 @@ class Dd4hep(CMakePackage):
variant('hepmc3', default=False, description="Enable build with hepmc3")
variant('lcio', default=False, description="Enable build with lcio")
variant('edm4hep', default=True, description="Enable build with edm4hep")
variant('debug', default=False, description="Enable debug build")
variant('debug', default=False,
description="Enable debug build flag - adds extra info in"
" some places in addtion to the debug build type")
depends_on('cmake @3.12:', type='build')
depends_on('ninja', type='build')
@ -58,7 +60,7 @@ class Dd4hep(CMakePackage):
extends('python')
depends_on('xerces-c', when='+xercesc')
depends_on('geant4@10.2.2:', when='+geant4')
depends_on('assimp', when='+assimp')
depends_on('assimp@5.0.2:', when='+assimp')
depends_on('hepmc3', when="+hepmc3")
depends_on('lcio', when="+lcio")
depends_on('edm4hep', when="+edm4hep")
@ -75,8 +77,11 @@ def cmake_args(self):
self.define_from_variant('DD4HEP_USE_GEANT4', 'geant4'),
self.define_from_variant('DD4HEP_USE_LCIO', 'lcio'),
self.define_from_variant('DD4HEP_USE_HEPMC3', 'hepmc3'),
self.define_from_variant('DD4HEP_LOAD_ASSIMP', 'assimp'),
self.define_from_variant('DD4HEP_BUILD_DEBUG', 'debug'),
# Downloads assimp from github and builds it on the fly.
# However, with spack it is preferrable to have a proper external
# dependency, so we disable it.
self.define('DD4HEP_LOAD_ASSIMP', False),
"-DCMAKE_CXX_STANDARD={0}".format(cxxstd),
"-DBUILD_TESTING={0}".format(self.run_tests),
"-DBOOST_ROOT={0}".format(spec['boost'].prefix),