Merge pull request #5118 from myk002/myk_json

update jsoncpp
DFHack · Dec 22, 2024 · 5788db2 · 5788db2
2 parents 2a4ae64 + 30b15ec
commit 5788db2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,14 @@ set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 set(DFHACK_ABI_VERSION 2)
 set(DFHACK_BUILD_ID "" CACHE STRING "Build ID (should be specified on command line)")
 
+# set up ccache
+find_program(CCACHE_EXECUTABLE "ccache" HINTS /usr/local/bin /opt/local/bin)
+if(CCACHE_EXECUTABLE)
+    message(STATUS "using ccache")
+    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" CACHE PATH "ccache" FORCE)
+    set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" CACHE PATH "ccache" FORCE)
+endif()
+
 # Set up build types
 if(CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo" CACHE STRING "List of supported configuration types" FORCE)

diff --git a/depends/jsoncpp-sub b/depends/jsoncpp-sub
+1 −1		.clang-format
+20 −0		.github/workflows/clang-format.yml
+18 −0		.github/workflows/cmake.yml
+65 −0		.github/workflows/meson.yml
+0 −71		.travis.yml
+0 −130		.travis_scripts/cmake_builder.sh
+0 −83		.travis_scripts/meson_builder.sh
+0 −356		.travis_scripts/run-clang-format.py
+0 −4		.travis_scripts/run-clang-format.sh
+0 −8		.travis_scripts/travis.before_install.linux.sh
+0 −0		.travis_scripts/travis.before_install.osx.sh
+0 −5		.travis_scripts/travis.install.linux.sh
+0 −1		.travis_scripts/travis.install.osx.sh
+18 −18		CMakeLists.txt
+1 −1		CONTRIBUTING.md
+17 −0		SECURITY.md
+3 −3		amalgamate.py
+4 −4		devtools/batchbuild.py
+1 −1		example/readFromString/readFromString.cpp
+2 −2		include/PreventInSourceBuilds.cmake
+15 −3		include/json/allocator.h
+1 −1		include/json/config.h
+2 −1		include/json/json_features.h
+38 −6		include/json/reader.h
+40 −8		include/json/value.h
+4 −5		include/json/version.h
+9 −10		include/json/writer.h
+9 −7		jsoncpp-namespaced-targets.cmake
+1 −1		jsoncppConfig.cmake.in
+6 −0		jsoncppConfig.cmake.meson.in
+41 −4		meson.build
+5 −2		src/jsontestrunner/main.cpp
+2 −5		src/lib_json/CMakeLists.txt
+105 −81		src/lib_json/json_reader.cpp
+33 −16		src/lib_json/json_value.cpp
+10 −5		src/lib_json/json_writer.cpp
+1 −1		src/test_lib_json/jsontest.cpp
+2 −2		src/test_lib_json/jsontest.h
+61 −12		src/test_lib_json/main.cpp
+4 −0		test/data/fail_strict_comment_01.json
+4 −0		test/data/fail_strict_comment_02.json
+3 −0		test/data/fail_strict_comment_03.json
+1 −0		test/data/fail_test_object_02.json
+3 −0		test/data/legacy_test_real_13.expected
+1 −0		test/data/legacy_test_real_13.json
+6 −3		test/runjsontests.py