haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
2692 commits 11 branches 56 tags 222 MiB
Commit graph

49 commits

Author SHA1 Message Date
Sonu Lohani b8ad3388ec Fixed compiler error in VS 2015 for debug mode 
https://github.com/nlohmann/json/issues/1114
 2018-06-29 09:34:41 +05:30
Niels Lohmann 09c0df4a21
👷 choosing correct image 2018-06-24 17:40:16 +02:00
Niels Lohmann d8fe13fc83
🔨 fixed escaping for MinGW 2018-06-24 16:57:53 +02:00
Niels Lohmann 495436a5d5
Merge pull request #1026 from ktonon/develop 
Added public target_compile_features for auto and constexpr
 2018-04-03 17:34:42 +02:00
Niels Lohmann 4efa8cdb4c
💚 fixed Valgrind options #1030 2018-03-29 17:19:21 +02:00
Kevin Tonon 73cc5089e3 Using target_compile_features to specify C++ 11 standard 2018-03-28 13:11:49 -04:00
Niels Lohmann 476b2e09be
💚 added regression tests for #972 and #977 2018-03-06 20:13:31 +01:00
Niels Lohmann 74675dd69c
⏪ back to the original version 2018-02-09 22:40:52 +01:00
Niels Lohmann ab05df3a48
🔨 another try 2018-02-09 22:27:08 +01:00
Niels Lohmann 0111f3187e
🔨 working on #953 2018-02-09 21:30:15 +01:00
Niels Lohmann 737cffe0cb
🔨 fixed directory for lcov coverage 2018-02-04 20:58:50 +01:00
Théo DELRIEU 14cd019861
fix cmake install directory (for real this time) 
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
 2018-02-01 11:06:51 +01:00
Matthias Möller 5b4855dea2 fix targetname 2017-11-26 10:29:51 +01:00
Jamie Seward a99fcb4e7d Add comments and newline 2017-10-17 22:53:35 -07:00
Jamie Seward 917d9d8bc3 Fix Visual Studio 2017 warnings 2017-10-16 23:23:55 -07:00
Jamie Seward af99090742 Disable warning C4389: '==': signed/unsigned mismatch 
Lots of tests have this warning.

Also moved out of for loop, doesn't need to be done every loop.
 2017-10-16 01:02:48 -07:00
Jamie Seward 5ec44fe9e3 Add /W4 for MSVS 2017-10-15 22:56:38 -07:00
Niels Lohmann 75f4678b96
🔨 added filter script for branch coverage 2017-10-05 19:08:15 +02:00
Niels Lohmann 1b3df3a63f
🔨 trying to use Coveralls with CMake #698 2017-10-04 22:18:21 +02:00
Niels Lohmann 4f5c345817
👷 run sanitizer another time to check if it works 2017-08-26 08:20:37 +02:00
Niels Lohmann 5e7acbf05e
👷 adjusted flags for Clang sanitizer 
we are overrding the CXXFLAGS provided by travis in order to use gcc's libstdc++
 2017-08-25 22:34:00 +02:00
Niels Lohmann 268f5a3d0a
👷 added option to switch off exceptions 2017-08-25 21:29:27 +02:00
Niels Lohmann 3dcd360139
👷 adding status messages 2017-08-25 20:19:58 +02:00
Niels Lohmann 05b97c473a
👷 added flags for Valgrind and Clang sanitizer 2017-08-25 20:12:21 +02:00
Niels Lohmann c87b080cc5
👷 new cmake file for test cases 2017-08-25 18:06:22 +02:00
Niels Lohmann f513c46749
🔨 further cleanup 2017-07-22 13:35:04 +02:00
Niels Lohmann 0c3ffe12cd
⏪ reverting first/second experiment #350 2017-05-15 21:07:58 +02:00
Jay Sistar d6c78dacd8 Fixing assignement for iterator wrapper second, and adding unit test 2017-05-10 17:53:27 +00:00
Tushar Maheshwari 85ce4d7b53 ⚡ cmake compile time reduce using cotire 
- Add prefix header
  - Include catch.hpp
  - Include json.hpp
    - Replace private with public for all json_unit files
- Move `unit.cpp` to an object library
- cotire issue: strip whitespace from CMAKE_INCLUDE_SYSTEM_FLAG_CXX
 2017-02-19 13:35:54 +05:30
Théo DELRIEU b8012876a5 add noexcept checks, and some missing noexcepts 2017-01-21 16:14:22 +01:00
Théo DELRIEU 837b81d672 renamed unit-constructor3.cpp to unit-udt.cpp 2017-01-21 16:14:21 +01:00
Théo Delrieu b443edf49e add first version support for user-defined types 2017-01-21 16:14:20 +01:00
Niels Lohmann 3a9ccfac22 🚧 cleanup 2017-01-12 21:35:27 +01:00
Niels Lohmann 328eb55dc4 🚧 started working on #397 2016-12-30 14:02:51 +01:00
Niels Lohmann ad241a2260 🔨 moved third-party code into separate folder 2016-12-22 09:35:53 +01:00
Niels Lohmann eef408e5fb ✅ tests for CBOR 2016-11-27 00:09:24 +01:00
Niels edc81f3bc1 💚 restored test call 2016-11-16 22:49:25 +01:00
Niels 0c9ab9427f 💚 added verbose message to check AppVeyor build 2016-11-16 22:02:38 +01:00
Niels 543745a10e starting to integrate MessagePack (#358) 2016-11-11 17:11:13 +01:00
Niels 628a5eae50 reset build file 2016-08-17 22:33:26 +02:00
Niels f40f81c87e forgot a semicolon 2016-08-17 21:44:53 +02:00
Niels c0922c7aac /Wall 2016-08-17 21:43:28 +02:00
Niels 35f22e8596 checking MSVC compiler flags 2016-08-17 21:38:19 +02:00
Niels 38f562af2a reorganization into smaller test units 2016-08-04 22:51:08 +02:00
Niels d80329034e split test suite in one file per test case 2016-08-04 21:55:47 +02:00
Niels 5541e6f6f9 split unit tests 2016-08-04 07:24:46 +02:00
Robert Marki 639d63217e Define CMake/CTest tests 
Instead of copying the test executable and the JSON files used by
the tests at install time, define CMake/CTest tests for running
the json_unit executable from any build directory with the project's
source directory as its working directory.

- call enable_testing in the main lists file to allow the definition
of tests
- remove install commands from the test directory's lists file
- define two tests
  - json_unit_default for running the default tests by executing
json_unit without any arguments
  - json_unit_all for running all the tests by executing json_unit
with the "*" argument
- update the AppVeyor configuration file to use the new testing method
 2016-05-18 11:53:49 +02:00
Chris Kitching 527a69bb64
Install the test binary and test data. Fixes #241 
The resulting install tree, when tests are enabled, looks like this:

```
.
├── cmake
│   ├── nlohmann_jsonConfig.cmake
│   ├── nlohmann_jsonConfigVersion.cmake
│   └── nlohmann_jsonTargets.cmake
├── include
│   └── nlohmann
│       └── json.hpp
└── test
    ├── bin
    │   └── json_unit
    └── data
        ├── json_nlohmann_tests
        │   ├── all_unicode.json
        │   └── bom.json
        ├── json.org
        │   ├── 1.json
        │   ├── ...
        ├── json_roundtrip
        │   ├── roundtrip01.json
        │   ├── roundtrip02.json
        │   └── ...
        ├── json_tests
        │   ├── fail10.json
        │   └── ...
        └── json_testsuite
            └── sample.json
```

It has the property that you can invoke the test binary from the
root of the install tree and the tests work correctly (you no
longer depend on the test binary being run inside the source
tree).

If tests are disabled, the entire `test/` subtree is omitted.
Notice how that yields exactly what you want for using this
library in other projects.

I do not believe I need to update travis due to this change, as the
evil Makefile continues to do in-tree builds. I expect I'll find
out soon enough.
 2016-05-11 01:43:42 +01:00
Chris Kitching af76508fe7
Introduce structure to the test/ directory 
This introduces a clear separation between test data and test
binaries. Test data is moved into test/data, and the test binaries
move into test/src. A new CMake script specific to building the
tests is introduced in /test to slightly clean up the toplevel
one.

As well as tidying things up, this makes the next step trivial...
 2016-05-11 01:30:08 +01:00