Scarfski/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-02 23:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'json-view/08-view-builder' into json-view/10-view-document

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>

# Conflicts:
#	Makefile
#	cmake/ci.cmake
This commit is contained in:
Niels Lohmann
2026-10-01 10:19:49 +02:00
parent 2d7024eed1 cb51f80e34
commit 371a8a3d9f
306 changed files with 6550 additions and 15208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/mkdocs/docs/integration/cmake.md
View File

@@ -169,6 +169,12 @@ Enable position diagnostics by defining macro [`JSON_DIAGNOSTIC_POSITIONS`](../a
Disable default `enum` serialization by defining the macro
[`JSON_DISABLE_ENUM_SERIALIZATION`](../api/macros/json_disable_enum_serialization.md). This option is `OFF` by default.
### `JSON_DisableTupleReferenceConversion`
Disable the conversion from a one-element `std::tuple` holding a reference to a JSON value by defining the macro
[`JSON_DISABLE_TUPLE_REFERENCE_CONVERSION`](../api/macros/json_disable_tuple_reference_conversion.md). This option is
`OFF` by default.
### `JSON_FastTests`
Skip expensive/slow test suites. This option is `OFF` by default. Depends on `JSON_BuildTests`.

4
docs/mkdocs/docs/integration/package_managers.md
View File

@@ -678,11 +678,11 @@ to install the [nlohmann-json](https://ports.macports.org/port/nlohmann-json/) p
1. Create the following files:
```cpp title="example.cpp"
--8<-- "integration/homebrew/example.cpp"
--8<-- "integration/macports/example.cpp"
```
```cmake title="CMakeLists.txt"
--8<-- "integration/homebrew/CMakeLists.txt"
--8<-- "integration/macports/CMakeLists.txt"
```
2. Install the package: