Commit a0ef5a19 authored by Niels's avatar Niels
Browse files

addressed #319, #321, and #318

parent 04b11d78
......@@ -495,6 +495,8 @@ I deeply appreciate the help of the following people.
- [Thomas Braun](https://github.com/t-b) fixed a warning in a test case.
- [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290).
- [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation.
- [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`.
- [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion.
Thanks a lot for helping out!
......@@ -516,4 +518,14 @@ $ make check
All tests passed (8905161 assertions in 35 test cases)
```
Alternatively, you can use [https://cmake.org](CMake) and run
```sh
mkdir build
cd build
cmake ..
make
ctest
```
For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment