amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-06 22:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'json-view/18-view-object-index' into json-view/19-edit-set

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-09-29 23:35:40 +02:00
2 parents ada8f17230 fa58c6e6da
commit 5cbb9095ee
14 files changed
+102 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/check_amalgamation.yml
+3 -1
View File
@@ -67,7 +67,9 @@ jobs:
python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json.json -s .
python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_fwd.json -s .
python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_view.json -s .
# the configuration of json_view.hpp comes with the pull request until
# it is on develop; the tool itself is still develop's
python3 $TOOL_DIR/amalgamate.py -c $MAIN_DIR/tools/amalgamate/config_json_view.json -s .
# the header list of the Bazel "json" target must match the files in include/
cmake -P cmake/scripts/gen_bazel_build_file.cmake