From 30b15ec51657ae51c143654afb2d863eaffc5af5 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 22 Dec 2024 00:37:02 -0800 Subject: [PATCH] update jsoncpp dep --- CMakeLists.txt | 8 ++++++++ depends/jsoncpp-sub | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b6e861978..e8fa60ec04 100644 --- 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 index 3a72e1cae5..ad10fabe6f 160000 --- a/depends/jsoncpp-sub +++ b/depends/jsoncpp-sub @@ -1 +1 @@ -Subproject commit 3a72e1cae5d19ac71947f8e3380ac3941359bff1 +Subproject commit ad10fabe6f175a6b5559c34c18d9c96dfb96e0f5