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

Add nlohmann_json 3.4.0 for better compatibility #1797

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Add nlohmann_json 3.4.0 for better compatibility #1797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4dccc5
Add nlohmann_json 3.4.0 for better compatibility
xyz1001 Jun 1, 2020
1330515
Merge branch 'master' into modify/add_nlohmann_json_3_4_0
uilianries Jun 1, 2020
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
3 changes: 3 additions & 0 deletions recipes/nlohmann_json/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"3.4.0":
sha256: C377963A95989270C943D522BFEFE7B889EF5ED0E1E15D535FD6F6F16ED70732
url: https://github.com/nlohmann/json/archive/v3.4.0.tar.gz
"3.1.1":
sha256: 9f3549824af3ca7e9707a2503959886362801fb4926b869789d6929098a79e47
url: https://github.com/nlohmann/json/archive/v3.1.1.tar.gz
Expand Down
2 changes: 2 additions & 0 deletions recipes/nlohmann_json/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
versions:
"3.4.0":
folder: all
"3.1.1":
folder: all
"3.7.0":
Expand Down