Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nlohmann_json to v3.11.1 #596

Merged
merged 1 commit into from
Aug 2, 2022
Merged

Update nlohmann_json to v3.11.1 #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/configs/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ hunter_default_version(nanosvg VERSION 0.0.0-2b08dee-p0)
hunter_default_version(ncnn VERSION 20180314-p2)
hunter_default_version(ncursesw VERSION 6.1)
hunter_default_version(nlohmann_fifo_map VERSION 0.0.0-0dfbf5d-p1)
hunter_default_version(nlohmann_json VERSION 3.10.5)
hunter_default_version(nlohmann_json VERSION 3.11.1)
hunter_default_version(nng VERSION 1.1.1)
hunter_default_version(nsync VERSION 1.14-p1)
hunter_default_version(occt VERSION 7.4.0-p0)
Expand Down
9 changes: 9 additions & 0 deletions cmake/projects/nlohmann_json/hunter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,15 @@ hunter_add_version(
SHA1 8969f5ad1a422e01f040ff48dcae9c0e6ad0811d
)

# v3.11.0 omitted; was released with a bug

hunter_add_version(
PACKAGE_NAME nlohmann_json
VERSION "3.11.1"
URL "https://github.com/nlohmann/json/archive/v3.11.1.tar.gz"
SHA1 ac7ee8446d7c5099a590c3fdb05df5ce56ee04c8
)

hunter_cmake_args(nlohmann_json CMAKE_ARGS JSON_BuildTests=OFF)

hunter_pick_scheme(DEFAULT url_sha1_cmake)
Expand Down