From f09656e3f8a1982bdb00492270cfa54cbc1a710c Mon Sep 17 00:00:00 2001 From: vvolkl Date: Fri, 31 Jul 2020 05:21:02 +0200 Subject: New Versions: dd4hep, podio (#17659) * [dd4hep] add new patch version * [podio] add new version and update env vars * [dd4hep] add hepmc3 variant --- var/spack/repos/builtin/packages/dd4hep/package.py | 4 ++++ var/spack/repos/builtin/packages/podio/package.py | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index c8a28647c0..112536afab 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -22,6 +22,7 @@ class Dd4hep(CMakePackage): maintainers = ['vvolkl', 'drbenmorgan'] version('master', branch='master') + version('1.13.1', sha256='83fa70cd74ce93b2f52f098388dff58d179f05ace5b50aea3f408bb8abf7cb73') version('1.13.0', sha256='0b1f9d902ebe21a9178c1e41204c066b29f68c8836fd1d03a9ce979811ddb295') version('1.12.1', sha256='85e8c775ec03c499ce10911e228342e757c81ce9ef2a9195cb253b85175a2e93') version('1.12.0', sha256='133a1fb8ce0466d2482f3ebb03e60b3bebb9b2d3e33d14ba15c8fbb91706b398') @@ -38,6 +39,7 @@ class Dd4hep(CMakePackage): variant('xercesc', default=False, description="Enable 'Detector Builders' based on XercesC") variant('geant4', default=False, description="Enable the simulation part based on Geant4") variant('assimp', default=False, description="Enable CAD interface based on Assimp") + variant('hepmc3', default=False, description="Enable build with hepmc3") depends_on('cmake @3.12:', type='build') depends_on('boost @1.49:') @@ -46,6 +48,7 @@ class Dd4hep(CMakePackage): depends_on('xerces-c', when='+xercesc') depends_on('geant4@10.2.2:', when='+geant4') depends_on('assimp', when='+assimp') + depends_on('hepmc3', when="+hepmc3") def cmake_args(self): spec = self.spec @@ -58,6 +61,7 @@ class Dd4hep(CMakePackage): "-DDD4HEP_USE_XERCESC={0}".format(spec.satisfies('+xercesc')), "-DDD4HEP_USE_GEANT4={0}".format(spec.satisfies('+geant4')), "-DDD4HEP_LOAD_ASSIMP={0}".format(spec.satisfies('+assimp')), + "-DDD4HEP_USE_HEPMC3={0}".format(spec.satisfies('+hepmc3')), "-DBUILD_TESTING={0}".format(self.run_tests), "-DBOOST_ROOT={0}".format(spec['boost'].prefix), "-DBoost_NO_BOOST_CMAKE=ON", diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index 7211cdf111..9b9d83e3c5 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -17,6 +17,7 @@ class Podio(CMakePackage): maintainers = ['vvolkl', 'drbenmorgan'] version('master', branch='master') + version('0.11.0', sha256='4b2765566a14f0ddece2c894634e0a8e4f42f3e44392addb9110d856f6267fb6') version('0.10.0', sha256='b5b42770ec8b96bcd2748abc05669dd3e4d4cc84f81ed57d57d2eda1ade90ef2') version('0.9.2', sha256='8234d1b9636029124235ef81199a1220968dcc7fdaeab81cdc96a47af332d240') version('0.9.0', sha256='3cde67556b6b76fd2d004adfaa3b3b6173a110c0c209792bfdb5f9353e21076f') @@ -44,15 +45,6 @@ class Podio(CMakePackage): args.append('-DBUILD_TESTING=%s' % self.run_tests) return args - def setup_build_environment(self, spack_env): - spack_env.prepend_path('LD_LIBRARY_PATH', self.spec['root'].prefix.lib) - - def setup_dependent_build_environment(self, env, dependent_spec): - env.set('PODIO', self.prefix) - - def setup_dependent_run_environment(self, env, dependent_spec): - env.set('PODIO', self.prefix) - def url_for_version(self, version): # podio releases are dashes and padded with a leading zero # the patch version is omitted when 0 -- cgit v1.2.3-60-g2f50