amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-05-03 12:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,492 Commits 19 Branches 57 Tags
0f67c5849f03926fd96542fcee6145263f98ea25
Commit Graph

477 Commits

Author SHA1 Message Date
Niels Lohmann 5ff4d7b7ff Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-05-28 12:54:13 +02:00
Quentin Barbarat e44418ea26 readme: fix typo in CMake FetchContent example 2020-05-27 13:51:13 +02:00
Niels Lohmann 325e8ab8ab 🔧 explicitly switch on tests in CI 2020-05-27 13:22:14 +02:00
Niels Lohmann ed5c28d00c 👥 update contributor list 2020-05-27 13:07:24 +02:00
Niels Lohmann 27fe50dc92 📝 add example for contains #2133 
Closes #2133.
 2020-05-26 12:46:04 +02:00
Antony Kellermann 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. 2020-05-25 20:46:39 -04:00
Niels Lohmann 5dec7166ea Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-18 09:13:22 +02:00
Niels Lohmann 16d78a82e0 👷 add link to GitHub workflows 2020-05-18 09:12:18 +02:00
Niels Lohmann 904642f261 ♻️ rename internal_binary_t with binary_t 2020-05-17 22:50:27 +02:00
Niels Lohmann fc267af909 📝 update CI list 2020-05-14 17:53:00 +02:00
Niels Lohmann 33ae93beed 📝 update CI list 2020-05-14 07:55:01 +02:00
Niels Lohmann ec68bb3387 📝 update CI list 2020-05-13 20:18:56 +02:00
Niels Lohmann 6778ad8b0a 📝 update year 2020-05-12 22:26:55 +02:00
Niels Lohmann 7dbe5cf904 📝 update badges 2020-05-12 21:43:33 +02:00
Niels Lohmann a3a803a389 📝 add FOSSA status badge 2020-05-10 13:49:26 +02:00
Niels Lohmann a50a14088c Merge pull request #2081 from nlohmann/external_test_data 
Use external test data
 2020-05-04 20:58:02 +02:00
Niels Lohmann 2f0d37d7d2 🔥 remove fastcov 2020-05-02 23:48:11 +02:00
Niels Lohmann 9c0c58d948 🔥 remove Doozer CI 2020-05-02 23:41:28 +02:00
ArthurSonzogni f26689e006 Fix README.md 
About pull request:
https://github.com/nlohmann/json/pull/2074

An error has been introduced by accepting the suggestions:
https://github.com/ArthurSonzogni/json/commit/4be4a038ccd17aab0a4cc85200a6a0b41e1cccf2

One was about removing ~~~, but it was meant to be replaced by ``` in
reality. This caused the README.md to be slightly broken.
 2020-05-01 13:55:24 +02:00
Niels Lohmann 798dbb5c19 📝 add detail 2020-05-01 13:19:49 +02:00
Arthur Sonzogni 4be4a038cc Apply suggestions from code review 
Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-04-29 21:08:39 +02:00
ArthurSonzogni c331706644 Add CMake fetchcontent documentation and tests 
Github issue:
https://github.com/nlohmann/json/issues/2073

nlohmann::json documents 2 way of depending on it using CMake
1) Copy-paste the project/source into your own project.
2) Install nlohman::json and then use find_package.

(1) pollutes your git repository, (2) requires everyone to install the
dependencies themselves.

Since 2018, CMake provide some kind of 'package manager' features using
[FetchContent](https://cmake.org/cmake/help/v3.17/module/FetchContent.html)
It gives the following:
~~~cmake
include(FetchContent)

FetchContent_Declare(json
  GIT_REPOSITORY https://github.com/nlohmann/json
  GIT_TAG v3.7.3)

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
  FetchContent_Populate(json)
  add_subdirectory( ${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
~~~

Then declares the dependency in the target using it:
~~~cmake
target_link_library(my_project PRIVATE nlohmann_json::nlohmann_json
~~~

This patch updates the documentation and provides tests.
 2020-04-29 18:28:06 +02:00
Alexander Myasnikov b01bc05b2b updated wandbox link 2020-04-23 13:32:42 +03:00
Evgenii Sopov d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager 2020-04-11 16:30:04 +07:00
Niels Lohmann c6b298799a 👷 remove failing Travis workers 2020-04-07 09:09:44 +02:00
Niels Lohmann 554e8c7356 Merge pull request #2002 from alexandermyasnikov/develop 
fix error 'setw' is not a member of 'std' in Wandbox example
 2020-04-05 21:58:21 +02:00
Niels Lohmann 379ed1f67e 💰 add sponsor 2020-04-05 15:23:00 +02:00
Alexander Myasnikov 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example 2020-03-21 18:34:40 +03:00
Niels Lohmann 19843b038c Merge pull request #1933 from dota17/dota17-FAQ 
Update README.md : add a FAQ about memory release
 2020-03-19 11:25:47 +01:00
Niels Lohmann ebb5a4c09f 💰 add sponsor 2020-03-19 11:14:50 +01:00
chenguoping 2ccdfebaa7 fix typo 2020-03-14 18:10:55 +08:00
Alexander “weej” Jones 5fdb1d08aa README: Fix string representation of dumped json 
As is it's confusing and inconsistent with the indented form right below. The backslash escapes make it confusing.
 2020-03-10 19:37:20 +00:00
Chen 42566c6bef Update README.md 2020-02-17 15:40:52 +08:00
Chen 88097a250f Update README.md : add a FAQ about memory release 2020-02-10 21:03:57 +08:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann 6a6790ab68 Merge pull request #1917 from jothepro/update-links-to-hunter 
Readme: Updated links to hunter repo & docs
 2020-01-31 11:47:42 +01:00
Dave Lee f25a1287f9 Fix link to parse function in README 2020-01-29 14:19:00 -08:00
jothepro 0257533866 Updated links to hunter repo & docs 
hunter was recently passed over to a new maintainer, this is why the github url & the link to the documentation have changed.
 2020-01-29 22:33:59 +01:00
Joël Lamotte ab538ba523 Formatting 
(proper naming suggested by `build2`'s author)
 2020-01-21 17:49:23 +01:00
Joël Lamotte 708e107d8e Adds instruction for using Build2's package manager 
I created a `nlohmann-json` package for `build2` (https://build2.org) that have been published on the central public repository https://cppget.org : https://cppget.org/nlohmann-json (at the moment you can see that there is only one version: 3.7.3).

The repository of the package code is there: https://github.com/build2-packaging/nlohmann-json and is owned by the build2 community now. (with build2 you can use either a repository like cppget.org or a git repository so both are useful to users for different use cases).

This patch just add the basic information as to how to use this library with build2.
 2020-01-20 14:50:15 +01:00
Paul Jurczak bc95563814 Update README.md 2020-01-18 14:25:03 -07:00
Niels Lohmann b568619c4a 💰 add sponsor section 2019-12-15 19:26:51 +01:00
Carlos Gomes Martinho ac9df48453 style: format readme 2019-12-01 10:23:24 +01:00
Carlos Gomes Martinho f44e8ac090 revert: adding conan badge 2019-12-01 10:22:48 +01:00
Carlos Gomes Martinho 134a5faa2b docs: add central repository as conan source to readme 2019-11-29 13:49:53 +01:00
Konstantin Podsvirov f586bc014f README: Package in MSYS2 renamed to nlohmann-json 
This is done to correctly match with the
corresponding package in Archlinux.
 2019-11-23 05:02:20 +03:00
Niels Lohmann c0f52edbc3 📝 add badges 2019-11-22 21:17:31 +01:00
Niels Lohmann 3f044dad81 📝 add Xocde 11.2.1 to CI list 2019-11-22 08:00:41 +01:00
Niels Lohmann 0f6a58eeaf 👥 update contributors 2019-11-06 17:35:04 +01:00
Niels Lohmann 3790bd9ae0 👷 add Xcode 10.2 2019-11-04 06:22:39 +01:00