diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2019-11-08 09:00:10 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-11-08 11:00:10 -0600 |
| commit | c1ee069d1b308841bf0e8af035e8042289468855 (patch) | |
| tree | 9cbd189c5466d692e1184e159d5599204d49124d | |
| parent | 3c2542f38715ed920c7a65c6188565ae9df6371b (diff) | |
| download | spack-c1ee069d1b308841bf0e8af035e8042289468855.tar.gz spack-c1ee069d1b308841bf0e8af035e8042289468855.tar.bz2 spack-c1ee069d1b308841bf0e8af035e8042289468855.tar.xz spack-c1ee069d1b308841bf0e8af035e8042289468855.zip | |
openPMD-api: JSON Always On (#13641)
JSON is not a compile-time variant anymore and a mandatory
dependency from now on.
| -rw-r--r-- | var/spack/repos/builtin/packages/openpmd-api/package.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index 6dc7c89d78..ae4e603d68 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -26,8 +26,6 @@ class OpenpmdApi(CMakePackage): description='Enable ADIOS1 support') variant('adios2', default=False, description='Enable ADIOS2 support') - variant('json', default=True, - description='Enable JSON support') variant('python', default=False, description='Enable Python bindings') @@ -44,7 +42,7 @@ class OpenpmdApi(CMakePackage): depends_on('adios2@2.4.0:', when='+adios2') depends_on('adios2@2.4.0: ~mpi', when='~mpi +adios2') depends_on('adios2@2.4.0: +mpi', when='+mpi +adios2') - depends_on('nlohmann-json@3.7.0:', when='+json') + depends_on('nlohmann-json@3.7.0:') depends_on('py-pybind11@2.3.0:', when='+python', type='link') depends_on('py-numpy@1.15.1:', when='+python', type=['test', 'run']) depends_on('py-mpi4py@2.1.0:', when='+python +mpi', type=['test', 'run']) @@ -67,8 +65,6 @@ class OpenpmdApi(CMakePackage): 'ON' if '+adios1' in spec else 'OFF'), '-DopenPMD_USE_ADIOS2:BOOL={0}'.format( 'ON' if '+adios2' in spec else 'OFF'), - '-DopenPMD_USE_JSON:BOOL={0}'.format( - 'ON' if '+json' in spec else 'OFF'), '-DopenPMD_USE_PYTHON:BOOL={0}'.format( 'ON' if '+python' in spec else 'OFF'), # tests and examples @@ -84,10 +80,10 @@ class OpenpmdApi(CMakePackage): args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format( self.spec['python'].command.path)) - if spec.satisfies('+json'): - args.append('-DopenPMD_USE_INTERNAL_JSON:BOOL=OFF') - - args.append('-DopenPMD_USE_INTERNAL_VARIANT:BOOL=OFF') + args.extend([ + '-DopenPMD_USE_INTERNAL_JSON:BOOL=OFF', + '-DopenPMD_USE_INTERNAL_VARIANT:BOOL=OFF' + ]) if self.run_tests: args.append('-DopenPMD_USE_INTERNAL_CATCH:BOOL=OFF') |