diff options
| author | Hadrien G <grasland@lal.in2p3.fr> | 2020-01-25 19:35:53 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2020-01-25 12:35:53 -0600 |
| commit | f569577747dc27da776cb87b8e6d699377921b6c (patch) | |
| tree | 344998d837df370533bacba97232de1f974fe3bc /var | |
| parent | 1fd335d6549bf731ec36c9b5079bc29328a9c853 (diff) | |
| download | spack-f569577747dc27da776cb87b8e6d699377921b6c.tar.gz spack-f569577747dc27da776cb87b8e6d699377921b6c.tar.bz2 spack-f569577747dc27da776cb87b8e6d699377921b6c.tar.xz spack-f569577747dc27da776cb87b8e6d699377921b6c.zip | |
acts-core: Add and adapt to ACTS v0.14.0 and v0.15.0 (#14580)
* Add and adapt to ACTS v0.14.0
* Add v0.15.0 too
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/acts-core/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/acts-core/package.py b/var/spack/repos/builtin/packages/acts-core/package.py index c1ce827b32..16ecd155bc 100644 --- a/var/spack/repos/builtin/packages/acts-core/package.py +++ b/var/spack/repos/builtin/packages/acts-core/package.py @@ -34,6 +34,8 @@ class ActsCore(CMakePackage): maintainers = ['HadrienG2'] version('develop', branch='master') + version('0.15.0', commit='267c28f69c561e64369661a6235b03b5a610d6da') + version('0.14.0', commit='38d678fcb205b77d60326eae913fbb1b054acea1') version('0.13.0', commit='b33f7270ddbbb33050b7ec60b4fa255dc2bfdc88') version('0.12.1', commit='a8b3d36e7c6cb86487637589e0eff7bbe626054a') version('0.12.0', commit='f9cda77299606d78c889fb1db2576c1971a271c4') @@ -68,10 +70,11 @@ class ActsCore(CMakePackage): variant('json', default=False, description='Build the Json plugin') variant('tgeo', default=False, description='Build the TGeo plugin') - depends_on('cmake @3.9:', type='build') + depends_on('cmake @3.11:', type='build') depends_on('boost @1.62:1.69.99 +program_options +test', when='@:0.10.3') depends_on('boost @1.62: +program_options +test', when='@0.10.4:') depends_on('eigen @3.2.9:', type='build') + 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:', when='+tgeo @0.8.1:') depends_on('dd4hep @1.2:', when='+dd4hep') @@ -99,4 +102,7 @@ class ActsCore(CMakePackage): cxxstd = spec['root'].variants['cxxstd'].value args.append("-DCMAKE_CXX_STANDARD={0}".format(cxxstd)) + if spec.satisfies('@0.14.0: +json'): + args.append("-DACTS_USE_BUNDLED_NLOHMANN_JSON=OFF") + return args |