- 14 Jul, 2020 3 commits
-
-
Thomas Braun authored
MS Visual Studio 2019 has builtin support for other compiler toolsets [1]. This commit adds support for compiling using LLVM/Clang 10 using Visual Studio. ClangCL pretends to be MSVC so the usual MSVC flags apply, see also [2]. For detecting if ClangCL is used, newer cmake verisons (>= 3.15) have builtin support using CMAKE_CXX_COMPILER_FRONTEND_VARIANT [3], for older ones a workaround is available using CMAKE_CXX_SIMULATE_ID [4]. [1]: https://devblogs.microsoft.com/cppblog/clang-llvm-support-in-visual-studio/ [2]: https://clang.llvm.org/docs/UsersManual.html#clang-cl [3]: https://stackoverflow.com/a/10055571 [4]: https://github.com/microsoft/CMake/commit/4fe34b2d29ca67ea91b2545b223dad8abbcad282
-
Thomas Braun authored
-
Niels Lohmann authored
Makefile: Always use SED variable
-
- 13 Jul, 2020 2 commits
-
-
Niels Lohmann authored
Add Xcode 12 CI
-
Thomas Braun authored
We need to have a proper sed, even on MacOSX. So let's use the variable introduced in 191aa0fd (
🔧 overworked maintaner targets, 2019-03-28) in more places.
-
- 12 Jul, 2020 5 commits
-
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
Add ordered_json specialization with ordered object keys
-
Niels Lohmann authored
Make library work with Clang on Windows
-
- 11 Jul, 2020 12 commits
-
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
https://github.com/nlohmann/jsonNiels Lohmann authored
Conflicts: include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/json_sax.hpp include/nlohmann/detail/input/lexer.hpp include/nlohmann/detail/input/parser.hpp include/nlohmann/detail/json_pointer.hpp include/nlohmann/detail/output/serializer.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
-
Niels Lohmann authored
Simple ordered_json that works on all supported compilers
-
- 10 Jul, 2020 3 commits
-
-
gatopeich authored
-
gatopeich authored
-
Niels Lohmann authored
-
- 09 Jul, 2020 8 commits
-
-
gatopeich authored
-
gatopeich authored
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
-
Niels Lohmann authored
Add pkg-config file
-
Niels Lohmann authored
Make assert configurable via JSON_ASSERT
-
Niels Lohmann authored
-
Érico Rolim authored
-
Palmer Dabbelt authored
The meson builds install a pkg-config file, but the cmake builds don't. This adds a pkg-config file to the cmake builds that is functionally equivalent to the one generated from meson.
-
Niels Lohmann authored
Fix regression from #2181
-
- 08 Jul, 2020 4 commits
-
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
Niels Lohmann authored
-
- 06 Jul, 2020 3 commits
-
-
Niels Lohmann authored
-
-
Niels Lohmann authored
-