Commit Graph

479 Commits

Author SHA1 Message Date
kjpus 767a3a327d Link to issue #958 broken 2018-12-04 10:03:10 -05:00
Niels Lohmann d53873a251 Merge pull request #1363 from theodelrieu/doc/implicit_conversions
recommend using explicit from JSON conversions
2018-12-02 17:27:46 +01:00
Manvendra Singh 5de184b8fb readme: fix typo 2018-12-02 01:50:57 +05:30
Théo DELRIEU 7b961368d5 recommend using explicit from JSON conversions 2018-11-20 14:14:07 +01:00
Axel Huebl f049836d68 CMake: Optional Install if Embedded
When adding this library as embedded library with private
"target link", e.g. only used inside private source files, the
library does not need to be installed when the main project gets
installed.

This adds an additional option `JSON_Install` similar to the
test-build control switch in order to skip installing headers and
CMake config files if requested.

Avoids using
```cmake
add_subdirectory(path/to/nlohmann_json EXCLUDE_FROM_ALL)
```

which has further side-effects:
https://cmake.org/cmake/help/v3.0/command/add_subdirectory.html
2018-11-02 10:18:00 +01:00
Axel Huebl 689382a722 Fix EOL Whitespaces & CMake Spelling
Fix little leftover EOL whitespaces in `CMakeLists.txt` and
a spelling of CMake in README.md
2018-11-02 09:35:17 +01:00
Niels Lohmann 0f3c74d821 🔖 set version to 3.4.0 2018-10-30 22:18:45 +01:00
Niels Lohmann 85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping 2018-10-27 16:52:59 +02:00
Niels Lohmann ad639ad5e6 added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 2018-10-26 14:48:20 +02:00
Niels Lohmann 62126278a6 🔨 added fix for arrays 2018-10-25 13:01:18 +02:00
Niels Lohmann f102df3cba 📝 updated documentation #1314 2018-10-24 09:28:57 +02:00
Kostiantyn Ponomarenko f0c55ce0e0 Add Meson related info to README
Add more information about how one can get a Meson wrap file.

Signed-off-by: Kostiantyn Ponomarenko <konstantin.ponomarenko@gmail.com>
2018-10-17 21:46:45 +03:00
Niels Lohmann b911654857 📝 updated contributor list 2018-10-04 22:30:18 +02:00
Chuck Atkins 4c617611e2 docs: Add additional CMake documentation 2018-10-02 14:28:20 -04:00
Niels Lohmann c8231eff75 Merge pull request #1260 from chuckatkins/fix-cmake-target-alias
Fix broken cmake imported target alias
2018-10-01 17:44:50 +02:00
Chuck Atkins 02e653bdf7 docs: add a note in the readme about using the CMake imported target 2018-09-30 22:52:54 -04:00
Théo DELRIEU 521fe49fec Add basic_json::get_to function.
Takes an lvalue reference, and returns the same reference.

This allows non-default constructible types to be converted without
specializing adl_serializer.
This overload does not require CopyConstructible either.

Implements #1227
2018-09-28 11:25:23 +02:00
Henry Fredrick Schreiner 7a37ba0c02 Adding 4.8 test to travis 2018-09-27 22:31:39 +02:00
Niels Lohmann 99939d6340 📝 added lgtm.com badge
See https://lgtm.com/projects/g/nlohmann/json
2018-09-18 19:27:52 +02:00
Niels Lohmann 3811daa8a3 📝 release preparation 2018-08-18 12:00:14 +02:00
Niels Lohmann b5c54b41fd 📝 overworked documentation 2018-08-16 21:53:47 +02:00
Niels Lohmann 3ce4325350 📝 updated documentation of used compilers 2018-08-01 22:31:51 +02:00
Niels Lohmann 7bfc406ded 📝 added note about CocoaPods #1148 2018-07-05 21:18:46 +02:00
Niels Lohmann 396a914f9e 🔨 added macro to disable compiler check #1128 2018-06-26 22:47:40 +02:00
Julius Rakow 963d06a13c 📝 fix links to cppreference named requirements
"Concepts" have been renamed to "named requirements".
This is because P0898R3 Standard Library Concepts has been merged into
C++20.
Cppreference have moved their links accordingly.
2018-06-24 22:36:19 +02:00
Julius Rakow 9f00db48d9 📝 link to cppreference via HTTPS 2018-06-24 22:34:47 +02:00
Niels Lohmann 62457729e8 📝 mentioned MinGW in README 2018-06-24 18:03:59 +02:00
Niels Lohmann 0460b90977 📝 fix for #1052 #1139 2018-06-22 22:35:48 +02:00
Niels Lohmann 8efbf8d7bb 📝 documentation to avoid future issues like #1108 2018-05-28 18:14:44 +02:00
martin-mfg 377e956655 fix typo in readme
The README says:
> "The library itself contains of a single header file ..."

I guess "consists of a" is the wording that was intended here. Alternatively, "contains a" might also be what was intended. Either way, I think both versions work equally well and thus choose the one that I believe was intended.
2018-05-03 22:42:52 +02:00
Niels Lohmann 86b0732a10 📝 added public key used for commits and releases 2018-05-03 18:11:42 +02:00
Niels Lohmann 46ec2fddf8 📝 updated THANKS list 2018-04-10 18:13:37 +02:00
James Upjohn 7f20e9ddc7 Fixed incorrect version number in README
clang-900.0.39.2 is from LLVM 9.0.0, not 8.1.0
2018-04-10 17:16:44 +12:00
Axel Huebl 1ae9896387 Package Manager: Spack
I contributed a package to the Spack package manager.

Spack is a flexible package manager that supports multiple versions,
configurations, platforms, and compilers. It is popular in
high-performance computing.
2018-04-08 01:12:49 +02:00
Niels Lohmann afef474c0d 🔖 set version to 3.1.2 2018-03-14 21:09:27 +01:00
Niels Lohmann b56ac86471 📝 thanks for #1006 2018-03-12 18:44:19 +01:00
Niels Lohmann 9918523077 📝 cleanup after #1001 2018-03-09 21:31:46 +01:00
Niels Lohmann 1f3d2a3be7 📝 overworked README 2018-02-26 17:37:24 +01:00
Wilson 05d3bf1699 Make integration section concise 2018-02-25 22:12:44 -08:00
Niels Lohmann 938c861a09 🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
Niels Lohmann addbbbe136 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-02-09 23:32:37 +01:00
Niels Lohmann 0a64982e86 📝 cleanup after #954 2018-02-09 23:32:28 +01:00
Niels Lohmann e5d538c5ea Merge pull request #954 from pfultz2/patch-1
Add a note about installing the library with cget
2018-02-09 23:28:54 +01:00
Paul Fultz II 5731695d7b Clarify dev version and add space after the word flag. 2018-02-09 15:45:20 -06:00
Paul Fultz II 50863c5a09 Latest updates based on feedback 2018-02-09 15:35:46 -06:00
Niels Lohmann 8b457ace25 🐛 fixing CBOR's indefinity length strings #961
Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...
2018-02-06 20:43:03 +01:00
Patrik Huber ee76436592 Change to angle brackets 2018-02-06 11:29:37 +00:00
Patrik Huber ae688016f6 Changed links from master to develop branch 2018-02-04 12:41:46 +00:00
Patrik Huber 44b40d7c6a Fix links in README.md 2018-02-03 15:48:02 +00:00
Paul Fultz II 3402260983 Add a note about installing the library with cget 2018-02-02 11:13:13 -06:00