mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-18 16:57:51 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,711 Commits 13 Branches 56 Tags 272 MiB
7fc4b2901a
Commit Graph

505 Commits

Author SHA1 Message Date
Thomas Braun
25a59b59f2 Github Actions: Add ClangCL on Windows 
MS Visual Studio 2019 has builtin support for other compiler toolsets [1].

This commit adds support for compiling using LLVM/Clang 10 using Visual
Studio.

ClangCL pretends to be MSVC so the usual MSVC flags apply, see also [2].
For detecting if ClangCL is used, newer cmake verisons (>= 3.15) have
builtin support using CMAKE_CXX_COMPILER_FRONTEND_VARIANT [3], for older
ones a workaround is available using CMAKE_CXX_SIMULATE_ID [4].

[1]: https://devblogs.microsoft.com/cppblog/clang-llvm-support-in-visual-studio/
[2]: https://clang.llvm.org/docs/UsersManual.html#clang-cl
[3]: https://stackoverflow.com/a/10055571
[4]: 4fe34b2d29
 2020-07-14 16:02:44 +02:00
Thomas Braun
6d7f8b3793 README.md: Remove trailing whitespace 2020-07-14 15:36:42 +02:00
Niels Lohmann
938b867450
📝 add Xcode 12 to CI list 2020-07-12 21:45:00 +02:00
Niels Lohmann
cf741313b3
📝 add Clang on Windows to CI list 2020-07-12 15:31:17 +02:00
Niels Lohmann
9c21285133
Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-11 13:20:16 +02:00
gatopeich
0eb7b0a991
Update README.md per review comments 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2020-07-09 20:47:19 +01:00
Niels Lohmann
75d5d05993
Merge pull request #2253 from ericonr/pkgconf 
Add pkg-config file
 2020-07-09 20:42:42 +02:00
Érico Rolim
251fce819c README: add explanation on how to use pkg-config. 2020-07-09 03:59:53 -03:00
Niels Lohmann
99fc6b16ab
Merge branch 'develop' of https://github.com/nlohmann/json into issue2239 2020-07-06 12:52:59 +02:00
Niels Lohmann
efcc826ecb
🚨 fix warning 2020-07-06 12:37:39 +02:00
Niels Lohmann
98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x) 2020-07-06 12:22:31 +02:00
Niels Lohmann
eb7376bb13
Merge pull request #2225 from nlohmann/issue2175 
Simplify conversion from/to custom types
 2020-06-29 14:41:09 +02:00
Niels Lohmann
470f7c0c68
📝 add documentation 2020-06-29 13:43:06 +02:00
gatopeich
ddf0a45abb Use AllocatorType<ObjectType::value_type>, 
instead of hard-coding it for std::map's value_type
 2020-06-22 18:35:46 +01:00
Niels Lohmann
65e8ee985a
🔨 clean up 2020-06-22 08:59:03 +02:00
Niels Lohmann
24992003d9
📝 add notes from #2189 2020-06-20 09:55:11 +02:00
Niels Lohmann
1ecb7884d1
👥 update contributor list 2020-06-14 15:22:08 +02:00
Niels Lohmann
7444c7fa25
Merge pull request #2145 from FrancoisChabot/1813-user-input 
Fix Issue#1813: user defined input adapters
 2020-06-05 14:30:39 +02:00
Niels Lohmann
9212590764
👥 update contributor list 2020-06-03 13:56:01 +02:00
Niels Lohmann
c24218afe8
Merge remote-tracking branch 'origin/develop' into develop 2020-06-03 13:38:15 +02:00
Niels Lohmann
2ad847f21b
🔨 fix doxygen link 2020-06-03 12:30:42 +02:00
Niels Lohmann
fdf5a63dfd
🔨 fix Doxygen link 2020-06-03 12:30:10 +02:00
TotalCaesar659
0aa13599f0
Update URLs to HTTPS 2020-05-30 06:02:25 +03:00
Francois Chabot
0da131d717 minor readme correction 2020-05-28 17:12:26 -04:00
Francois Chabot
248f310215 cleaned up custom iterator example 2020-05-28 10:14:55 -04:00
Niels Lohmann
23c8ab95da
👥 update contributor list 2020-05-28 14:24:08 +02:00
Niels Lohmann
5ff4d7b7ff
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-05-28 12:54:13 +02:00
Francois Chabot
d3caf93ab0
Merge branch 'develop' into 1813-user-input 2020-05-28 03:40:34 -04:00
Francois Chabot
3a91a05db6 added custom input to readme 2020-05-28 03:13:39 -04: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:
4be4a038cc

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