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

Prepare: openPMD-api 0.15.0-dev (#29484)

Browse source 
Anticipate openPMD-api changes in the next major release that are
already in `dev` (aka Spack `develop`):
- C++17 requirement
- drop: `mpark-variant` public dependency
- add: `toml11` private dependency

Also add @franzpoeschel as co-maintainer for the Spack package.
This commit is contained in:
Axel Huebl 2022-06-01 18:13:33 -07:00 committed by GitHub
parent adef8f6ca7
commit 9784b8f926
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
var/spack/repos/builtin/packages/openpmd-api/package.py
View file

@ -13,12 +13,13 @@ class OpenpmdApi(CMakePackage):
url = "https://github.com/openPMD/openPMD-api/archive/0.14.2.tar.gz" url = "https://github.com/openPMD/openPMD-api/archive/0.14.2.tar.gz"
git = "https://github.com/openPMD/openPMD-api.git" git = "https://github.com/openPMD/openPMD-api.git"
maintainers = ['ax3l'] maintainers = ['ax3l', 'franzpoeschel']
tags = ['e4s'] tags = ['e4s']
# C++14 up until here # C++17 up until here
version('develop', branch='dev') version('develop', branch='dev')
# C++14 up until here
version('0.14.4', sha256='42b7bcd043e772d63f0fe0e5e70da411f001db10096d5b8be797ffc88e786379') version('0.14.4', sha256='42b7bcd043e772d63f0fe0e5e70da411f001db10096d5b8be797ffc88e786379')
version('0.14.3', sha256='57282455e0fb1873b4def1894fadadd6425dfc8349eac7fcc68daf677c48b7ce') version('0.14.3', sha256='57282455e0fb1873b4def1894fadadd6425dfc8349eac7fcc68daf677c48b7ce')
version('0.14.2', sha256='25c6b4bcd0ae1ba668b633b8514e66c402da54901c26861fc754fca55717c836') version('0.14.2', sha256='25c6b4bcd0ae1ba668b633b8514e66c402da54901c26861fc754fca55717c836')
@ -47,11 +48,12 @@ class OpenpmdApi(CMakePackage):
description='Enable Python bindings') description='Enable Python bindings')
depends_on('cmake@3.15.0:', type='build') depends_on('cmake@3.15.0:', type='build')
depends_on('mpark-variant@1.4.0:')
depends_on('catch2@2.6.1:', type='test') depends_on('catch2@2.6.1:', type='test')
depends_on('catch2@2.13.4:', type='test', when='@0.14.0:') depends_on('catch2@2.13.4:', type='test', when='@0.14.0:')
depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+ depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+
depends_on('nlohmann-json@3.9.1:') depends_on('nlohmann-json@3.9.1:')
depends_on('mpark-variant@1.4.0:', when='@:0.14.99') # pre C++17 releases
depends_on('toml11@3.7.1:', when='@0.15.0:')
with when('+hdf5'): with when('+hdf5'):
depends_on('hdf5@1.8.13:') depends_on('hdf5@1.8.13:')
depends_on('hdf5@1.8.13: ~mpi', when='~mpi') depends_on('hdf5@1.8.13: ~mpi', when='~mpi')
@ -105,10 +107,12 @@ def cmake_args(self):
self.define('openPMD_USE_INTERNAL_PYBIND11', False) self.define('openPMD_USE_INTERNAL_PYBIND11', False)
] ]
args += [ args.append(self.define('openPMD_USE_INTERNAL_JSON', False))
self.define('openPMD_USE_INTERNAL_JSON', False), if spec.satisfies('@:0.14'): # pre C++17 releases
self.define('openPMD_USE_INTERNAL_VARIANT', False) args.append(self.define('openPMD_USE_INTERNAL_VARIANT', False))
] if spec.satisfies('@0.15:'):
args.append(self.define('openPMD_USE_INTERNAL_TOML11', False))
if self.run_tests: if self.run_tests:
args.append(self.define('openPMD_USE_INTERNAL_CATCH', False)) args.append(self.define('openPMD_USE_INTERNAL_CATCH', False))
@ -117,6 +121,7 @@ def cmake_args(self):
def setup_run_environment(self, env): def setup_run_environment(self, env):
spec = self.spec spec = self.spec
# pre-load dependent CMake-PUBLIC header-only libs # pre-load dependent CMake-PUBLIC header-only libs
if spec.satisfies('@:0.14'): # pre C++17 releases
env.prepend_path('CMAKE_PREFIX_PATH', spec['mpark-variant'].prefix) env.prepend_path('CMAKE_PREFIX_PATH', spec['mpark-variant'].prefix)
env.prepend_path('CPATH', spec['mpark-variant'].prefix.include) env.prepend_path('CPATH', spec['mpark-variant'].prefix.include)
@ -132,10 +137,12 @@ def setup_run_environment(self, env):
env.prepend_path('CMAKE_PREFIX_PATH', spec['hdf5'].prefix) env.prepend_path('CMAKE_PREFIX_PATH', spec['hdf5'].prefix)
def setup_dependent_build_environment(self, env, dependent_spec): def setup_dependent_build_environment(self, env, dependent_spec):
spec = self.spec
# pre-load dependent CMake-PUBLIC header-only libs # pre-load dependent CMake-PUBLIC header-only libs
if spec.satisfies('@:0.14'): # pre C++17 releases
env.prepend_path('CMAKE_PREFIX_PATH', env.prepend_path('CMAKE_PREFIX_PATH',
self.spec['mpark-variant'].prefix) spec['mpark-variant'].prefix)
env.prepend_path('CPATH', self.spec['mpark-variant'].prefix.include) env.prepend_path('CPATH', spec['mpark-variant'].prefix.include)
def check(self): def check(self):
"""CTest checks after the build phase""" """CTest checks after the build phase"""