From cb3dbea198433641c806a9b1fa9a58d32fefc389 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Mon, 10 Feb 2020 11:06:56 +0100 Subject: acts-core: added v0.16.0 (#14839) * Adapt to ACTS v0.16 * ACTS uses the DD4hep XML components nowadays --- .../repos/builtin/packages/acts-core/package.py | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/acts-core/package.py b/var/spack/repos/builtin/packages/acts-core/package.py index 644397102a..1cd9fe6375 100644 --- a/var/spack/repos/builtin/packages/acts-core/package.py +++ b/var/spack/repos/builtin/packages/acts-core/package.py @@ -34,6 +34,7 @@ class ActsCore(CMakePackage): maintainers = ['HadrienG2'] version('develop', branch='master') + version('0.16.0', commit='b3d965fe0b8ae335909d79114ef261c6b996773a') version('0.15.0', commit='267c28f69c561e64369661a6235b03b5a610d6da') version('0.14.0', commit='38d678fcb205b77d60326eae913fbb1b054acea1') version('0.13.0', commit='b33f7270ddbbb33050b7ec60b4fa255dc2bfdc88') @@ -58,16 +59,18 @@ class ActsCore(CMakePackage): version('0.08.0', commit='99eedb38f305e3a1cd99d9b4473241b7cd641fa9') # Variants that affect the core ACTS library - variant('legacy', default=False, description='Build the Legacy package') + variant('benchmarks', default=False, description='Build the performance benchmarks') variant('examples', default=False, description='Build the examples') variant('tests', default=False, description='Build the unit tests') variant('integration_tests', default=False, description='Build the integration tests') # Variants the enable / disable ACTS plugins - variant('digitization', default=False, description='Build the geometric digitization plugin') variant('dd4hep', default=False, description='Build the DD4hep plugin') + variant('digitization', default=False, description='Build the geometric digitization plugin') + variant('fatras', default=False, description='Build the FAst TRAcking Simulation package') variant('identification', default=False, description='Build the Identification plugin') variant('json', default=False, description='Build the Json plugin') + variant('legacy', default=False, description='Build the Legacy package') variant('tgeo', default=False, description='Build the TGeo plugin') depends_on('cmake @3.11:', type='build') @@ -77,7 +80,7 @@ class ActsCore(CMakePackage): depends_on('nlohmann-json @3.2.0:', when='@0.14.0: +json') depends_on('root @6.10: cxxstd=14', when='+tgeo @:0.8.0') depends_on('root @6.10: cxxstd=17', when='+tgeo @0.8.1:') - depends_on('dd4hep @1.2:', when='+dd4hep') + depends_on('dd4hep @1.2: +xercesc', when='+dd4hep') def cmake_args(self): spec = self.spec @@ -86,15 +89,23 @@ class ActsCore(CMakePackage): enabled = spec.satisfies('+' + spack_variant) return "-DACTS_BUILD_{0}={1}".format(cmake_label, enabled) + integration_tests_label = "INTEGRATIONTESTS" + tests_label = "UNITTESTS" + if spec.satisfies('@:0.15.99'): + integration_tests_label = "INTEGRATION_TESTS" + tests_label = "TESTS" + args = [ - cmake_variant("LEGACY", "legacy"), + cmake_variant("BENCHMARKS", "benchmarks"), cmake_variant("EXAMPLES", "examples"), - cmake_variant("TESTS", "tests"), - cmake_variant("INTEGRATION_TESTS", "integration_tests"), + cmake_variant(tests_label, "tests"), + cmake_variant(integration_tests_label, "integration_tests"), cmake_variant("DIGITIZATION_PLUGIN", "digitization"), cmake_variant("DD4HEP_PLUGIN", "dd4hep"), + cmake_variant("FATRAS", "fatras"), cmake_variant("IDENTIFICATION_PLUGIN", "identification"), cmake_variant("JSON_PLUGIN", "json"), + cmake_variant("LEGACY", "legacy"), cmake_variant("TGEO_PLUGIN", "tgeo") ] -- cgit v1.2.3-70-g09d2