Niels Lohmann
0c2088823d
👷 ignore gh-pages branch in CircleCI
2020-08-14 13:56:42 +02:00
Niels Lohmann
fb8adb8e93
👷 ignore gh-pages branch in CircleCI
2020-08-14 13:52:42 +02:00
Niels Lohmann
f6c2947f1e
📝 add more API documentation
2020-08-14 13:47:54 +02:00
Niels Lohmann
0356e0c75b
📝 add more API documentation
2020-08-14 13:05:16 +02:00
Niels Lohmann
6674561d6a
📝 add more API documentation
2020-08-14 10:48:32 +02:00
Niels Lohmann
772f37c12d
Merge pull request #2354 from rbuch/develop
...
Fix typos in documentation
2020-08-14 06:04:56 +02:00
Ronak Buch
67d822d951
Fix typos in documentation
2020-08-13 15:44:58 -04:00
Niels Lohmann
298420263b
🚚 remove quotes from filename to fix Windows build
2020-08-13 15:12:41 +02:00
Niels Lohmann
dd2fb3b454
📝 add more API documentation
2020-08-13 15:03:28 +02:00
Niels Lohmann
ce6adc447a
📝 add more API documentation
2020-08-13 14:04:08 +02:00
Niels Lohmann
d360fec216
📝 add offline pages for docset
2020-08-13 13:35:05 +02:00
Niels Lohmann
178125ff9b
📝 add docset
2020-08-13 10:52:20 +02:00
Niels Lohmann
8d0aa09ab5
Merge pull request #2352 from nlohmann/private_macro
...
Remove "#define private public" from tests
2020-08-13 10:06:59 +02:00
Niels Lohmann
874f49e945
📝 add more API documentation
2020-08-12 14:29:25 +02:00
Niels Lohmann
fe89049aee
📝 add more API documentation
2020-08-12 13:41:59 +02:00
Niels Lohmann
9d726c25d5
♻️ remove "#define private public"
2020-08-12 13:30:06 +02:00
Niels Lohmann
b888afe5f4
Merge pull request #2349 from nlohmann/issue2348
...
Remove -Wimplicit-fallthrough warning
2020-08-11 09:05:02 +02:00
Niels Lohmann
37ce871eeb
Merge pull request #2347 from nlohmann/no_exceptions
...
Fix code to work without exceptions
2020-08-10 22:47:27 +02:00
Niels Lohmann
dd8cb2acc1
🚨 remove -Wimplicit-fallthrough warning #2348
2020-08-10 20:48:39 +02:00
Niels Lohmann
4080d0b1a4
✅ add test to compile without exceptions
2020-08-10 09:48:11 +02:00
Niels Lohmann
1b28a58280
Merge remote-tracking branch 'origin/develop' into develop
2020-08-10 09:24:25 +02:00
Niels Lohmann
824d55bf26
📝 fix documentation #1668
2020-08-10 09:24:11 +02:00
Niels Lohmann
e030d26089
Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler
...
fix cmake script overwriting compiler path
2020-08-08 12:15:10 +02:00
Jun Jie
41a99567e0
fix cmake script overwriting compiler path
...
This fixes #2343
2020-08-07 16:08:02 +08:00
Niels Lohmann
db78ac1d77
Merge branch 'release/3.9.1' into develop
2020-08-06 13:49:29 +02:00
Niels Lohmann
b3e5cb7f20
🔖 set version to 3.9.1
2020-08-06 13:45:29 +02:00
Niels Lohmann
f4155e4727
Merge pull request #2333 from nlohmann/fallthrough
...
Fix fallthrough warning
2020-08-01 15:32:21 +02:00
Niels Lohmann
8a54617240
Merge pull request #2332 from nlohmann/issue2330
...
Fix lexer to properly cope with repeated comments
2020-08-01 12:29:33 +02:00
Niels Lohmann
0326e4e2a6
🚨 fix fallthrough warning
2020-07-31 19:24:03 +02:00
Niels Lohmann
3888b1642a
🐛 fix lexer to properly cope with repeated comments #2330
2020-07-31 18:59:22 +02:00
Niels Lohmann
1da931730a
Merge pull request #2327 from nlohmann/issue2326
...
Fix name of Homebrew formula in documentation
2020-07-31 08:00:08 +02:00
Niels Lohmann
1eedee5e4e
Merge pull request #2319 from nlohmann/issue2315
...
Fix a bug due to missing overloads in ordered_map container
2020-07-31 07:59:18 +02:00
Niels Lohmann
501ad6fc59
📝 fix name of Homebrew formula #2326
2020-07-30 13:31:00 +02:00
Niels Lohmann
35daa5c00b
Merge pull request #2320 from wx257osn2/fix-typo
...
fix typo
2020-07-30 12:27:16 +02:00
Niels Lohmann
2326abc547
♻️ split regression tests
2020-07-30 12:13:05 +02:00
Niels Lohmann
f13af83a94
🐛 add more functions from std::map to nlohmann::ordered_map
2020-07-28 21:47:06 +02:00
I
2d3fe9d135
fix typo
2020-07-28 21:54:53 +09:00
Niels Lohmann
e590604822
🐛 fix a bug due to missing overloads in ordered_map container
2020-07-28 14:20:31 +02:00
Niels Lohmann
1b8efed06f
Merge pull request #2318 from eli-schwartz/installfix
...
cmake: install pkg-config file relative to current_binary_dir
2020-07-28 13:25:04 +02:00
Niels Lohmann
7d01a9e875
Merge branch 'develop' into installfix
2020-07-28 13:24:54 +02:00
Niels Lohmann
b3da8b325a
Merge pull request #2314 from xvitaly/fix-path
...
Fixed installation of pkg-config file on other than Ubuntu
2020-07-28 13:24:08 +02:00
Eli Schwartz
aa06a4761e
cmake: install pkg-config file relative to current_binary_dir
...
When the testsuite is enabled, the "cmake_add_subdirectory" test
adds a second copy of the project into the build configuration, and the
project files are installed twice.
This becomes super problematic when it tries to install a file from
CMAKE_BINARY_DIR which is only available in CMAKE_CURRENT_BINARY_DIR
and bombs out with the following error message:
```
[...]
-- Installing: <DESTDIR>/usr/lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
CMake Error at test/cmake_add_subdirectory/nlohmann_json/cmake_install.cmake:73 (file):
file INSTALL cannot find
"......./nlohmann-json/builddir/test/cmake_add_subdirectory/nlohmann_json.pc":
No such file or directory.
Call Stack (most recent call first):
test/cmake_add_subdirectory/cmake_install.cmake:47 (include)
test/cmake_install.cmake:49 (include)
cmake_install.cmake:94 (include)
```
2020-07-27 18:15:18 -04:00
Vitaly Zaitsev
8f9dc7eabe
Fixed installation of pkg-config file on other than Ubuntu
...
distributions.
Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org >
2020-07-27 16:54:16 +02:00
Niels Lohmann
d34771cafc
Merge branch 'release/3.9.0' into develop
2020-07-27 15:54:39 +02:00
Niels Lohmann
e110667d21
🔖 set version to 3.9.0
2020-07-27 15:48:09 +02:00
Niels Lohmann
c006fc9bec
📝 add more documentation
2020-07-27 14:07:13 +02:00
Niels Lohmann
84c0c76849
🚧 add Clang-Tidy configuration
2020-07-27 09:15:57 +02:00
Niels Lohmann
2f05f5175c
🚧 add Clang-Tidy configuration
2020-07-26 22:38:14 +02:00
Niels Lohmann
1b06184f22
👥 update list of contributors
2020-07-26 20:50:04 +02:00
Niels Lohmann
84a899f511
👥 update list of contributors
2020-07-26 14:54:51 +02:00
