zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump nlohman-json and fix cmake args (#25504)

Browse Source 
* Bump nlohman-json and fix cmake args

* Rename variant
This commit is contained in:
Harmen Stoppels 2021-09-02 03:28:11 +02:00 committed by GitHub
parent 156edffec2
commit 0c61b31922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/nlohmann-json/package.py
View File

@ -13,7 +13,9 @@ class NlohmannJson(CMakePackage):
url = "https://github.com/nlohmann/json/archive/v3.1.2.tar.gz" url = "https://github.com/nlohmann/json/archive/v3.1.2.tar.gz"
maintainers = ['ax3l'] maintainers = ['ax3l']
version('3.10.0', sha256='eb8b07806efa5f95b349766ccc7a8ec2348f3b2ee9975ad879259a371aea8084')
version('3.9.1', sha256='4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b') version('3.9.1', sha256='4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b')
version('3.9.0', sha256='9943db11eeaa5b23e58a88fbc26c453faccef7b546e55063ad00e7caaaf76d0b')
version('3.8.0', sha256='7d0edf65f2ac7390af5e5a0b323b31202a6c11d744a74b588dc30f5a8c9865ba') version('3.8.0', sha256='7d0edf65f2ac7390af5e5a0b323b31202a6c11d744a74b588dc30f5a8c9865ba')
version('3.7.2', sha256='914c4af3f14bb98ff084172685fba5d32e8ce4390ec8ba5da45c63daa305df4d') version('3.7.2', sha256='914c4af3f14bb98ff084172685fba5d32e8ce4390ec8ba5da45c63daa305df4d')
version('3.7.0', sha256='d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760') version('3.7.0', sha256='d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760')
@ -25,7 +27,7 @@ class NlohmannJson(CMakePackage):
version('3.1.2', sha256='e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54') version('3.1.2', sha256='e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54')
version('3.1.1', sha256='9f3549824af3ca7e9707a2503959886362801fb4926b869789d6929098a79e47') version('3.1.1', sha256='9f3549824af3ca7e9707a2503959886362801fb4926b869789d6929098a79e47')
variant('single_header', default=True, variant('multiple_headers', default=False,
description='Use amalgamated single-header') description='Use amalgamated single-header')
depends_on('cmake@3.8:', type='build') depends_on('cmake@3.8:', type='build')
@ -39,12 +41,7 @@ class NlohmannJson(CMakePackage):
conflicts('%pgi@:14') conflicts('%pgi@:14')
def cmake_args(self): def cmake_args(self):
spec = self.spec return [
define = CMakePackage.define self.define_from_variant('JSON_MultipleHeaders', 'multiple_headers'),
self.define('JSON_BuildTests', self.run_tests),
args = [
define('JSON_MultipleHeaders', '~single_header' in spec),
define('BUILD_TESTING', self.run_tests),
] ]
return args