Niels Lohmann
5bc4ff9da3
Merge branch 'feature/wstring' into develop
2018-04-29 17:29:57 +02:00
Niels Lohmann
fa3e42f826
Merge branch 'develop' into feature/wstring
2018-04-29 13:16:12 +02:00
Niels Lohmann
b5d1755dfb
🔥 removed commented-out test cases #1060
2018-04-22 15:41:42 +02:00
Niels Lohmann
0ab8fab338
Merge pull request #1058 from dns13/patch-1
...
Fix typo
2018-04-17 23:26:00 +05:30
Jan Schöppach
65b4d8251b
Fix typo in single_include, too
2018-04-17 13:02:36 +02:00
Jan Schöppach
53fb230098
Fix typo
2018-04-17 12:08:44 +02:00
Niels Lohmann
46ec2fddf8
📝 updated THANKS list
2018-04-10 18:13:37 +02:00
Niels Lohmann
b8bfd1140d
Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
...
Misc cmake packaging enhancements
2018-04-10 17:57:21 +02:00
Chuck Atkins
33a2154f8d
Enable target namespaces and build dir project config
...
CMake convention is to use a project namespace, i.e. Foo::, for imported
targets. When multiple targets are imported from a project, this looks
like Foo::Bar1 Foo::Bar2, etc. This adds the nlohmann_json:: namespace to
the exported target names.
This also allows the generated project config files to be used from the
build directory instead of just the install directory.
2018-04-10 09:08:38 -04:00
Niels Lohmann
29362c6ace
Merge pull request #1047 from jammehcow/patch-1
...
Fixed incorrect LLVM version number in README
2018-04-10 08:39:58 +02:00
Niels Lohmann
c02a3155d4
👷 added Xcode 9.3 builder
...
See https://blog.travis-ci.com/2018-04-09-say-bonjour-to-xcode-93-and-macos-high-sierra .
2018-04-10 08:39:28 +02:00
Niels Lohmann
8d8f890771
💩 first try on #1045
2018-04-10 08:29:07 +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
Chuck Atkins
031b88d315
Make the CMake install dir user-configurable
2018-04-09 11:31:25 -04:00
Guillaume Racicot
aaee18ce90
Added test for string conversion with string_view
2018-04-09 11:15:33 -04:00
Niels Lohmann
7c503c64b7
Merge pull request #1043 from coryan/patch-1
...
Fix trivial typo in comment.
2018-04-09 08:19:56 +02:00
Carlos O'Ryan
4286b16b71
Fix trivial typo in comment.
...
Not really important, but since I saw it.
2018-04-08 15:46:25 -04:00
Niels Lohmann
cf91b4f2bb
Merge branch 'develop' into feature/wstring
2018-04-08 11:36:58 +02:00
Niels Lohmann
f924df1835
Merge branch 'develop' into feature/sax2
2018-04-08 11:36:44 +02:00
Niels Lohmann
acf10d9af7
Merge pull request #1041 from ax3l/topic-spack
...
Package Manager: Spack
2018-04-08 11:32:35 +02:00
Niels Lohmann
e1ea8369ad
Merge branch 'develop' into feature/sax2
2018-04-08 09:31:59 +02:00
Niels Lohmann
40f279c59d
Merge branch 'feature/issue1021' into develop
2018-04-08 09:28:37 +02:00
Niels Lohmann
18a0271a95
Merge branch 'develop' into feature/issue1021
2018-04-08 09:21:43 +02: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
83b143382e
Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
...
CMake: 3.8+ is Sufficient
2018-04-07 15:14:59 +02:00
Axel Huebl
e439a1a9a7
CMake: 3.8+ is Sufficient
...
The current CMake scripts depend on CMake 3.8+.
This allows us to remove previous work-arounds.
2018-04-07 13:15:44 +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
Kevin Tonon
a35d414c39
Update CMake to latest on Travis
2018-04-03 08:28:07 -04:00
Niels Lohmann
08a7233d1b
🚑 fixed commit 1e08654
2018-04-02 22:38:44 +02:00
Niels Lohmann
1e08654f99
🔨 cleanup
2018-04-02 22:25:17 +02:00
Niels Lohmann
aa89c5e048
🔨 removing unget_character() function from input adapters #834
2018-04-02 21:10:48 +02:00
Niels Lohmann
6678eb2b4a
✅ improved test coverage #1031
2018-04-02 15:38:49 +02:00
Niels Lohmann
16c5bfeaad
👌 fixed compiler warnings #1031
2018-04-02 13:01:56 +02:00
Niels Lohmann
727dd4664b
🔨 trying to make tests run with MSVC #1031
2018-04-02 12:27:07 +02:00
Niels Lohmann
ab89ae4e50
🔨 trying to make tests run with MSVC #1031
2018-04-02 11:34:36 +02:00
Niels Lohmann
eb06d0531a
🚧 added input adapter for wide strings #1031
2018-04-01 19:12:36 +02:00
Niels Lohmann
ba6edd5634
🔨 cleanup
2018-03-30 00:38:18 +02:00
Niels Lohmann
850671b9f1
🔨 using a vector<bool> for the parser hierarchy
2018-03-29 18:45:43 +02:00
Niels Lohmann
4efa8cdb4c
💚 fixed Valgrind options #1030
2018-03-29 17:19:21 +02:00
Niels Lohmann
830c93fd09
📝 fixed example for operator> #1029
2018-03-29 17:07:55 +02:00
Guillaume Racicot
c78dbc366c
Added test for conversion to string_view
2018-03-29 01:03:57 -04:00
Guillaume Racicot
53d8d57921
Amalgamate single include
2018-03-29 01:03:36 -04:00
Niels Lohmann
5f723bbec6
🔨 realized callback parser wirh SAX interface #971
2018-03-28 23:39:39 +02:00
Niels Lohmann
896a9db461
🔨 improved code #1021
2018-03-28 19:37: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
a9baab76c2
🚑 fix for #1021
2018-03-28 18:20:55 +02:00
Niels Lohmann
4f6b2b6429
🔨 changed SAX interface
2018-03-21 20:12:06 +01:00
Niels Lohmann
2537677e4c
✅ improved test coverage
2018-03-20 23:40:01 +01:00
Niels Lohmann
9e1abb4842
✅ improved coverage
2018-03-20 22:39:08 +01:00
Niels Lohmann
1e38ffc014
✅ more tests
2018-03-20 20:04:11 +01:00
