addressed #319, #321, and #318

This commit is contained in:
Niels 2016-10-06 23:27:43 +02:00
parent 04b11d78ff
commit a0ef5a194c

View file

@ -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. - [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). - [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. - [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! Thanks a lot for helping out!
@ -516,4 +518,14 @@ $ make check
All tests passed (8905161 assertions in 35 test cases) 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). For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).