From b2e812941766e11394bdb124ff73d1fe544849a2 Mon Sep 17 00:00:00 2001 From: MetroWind Date: Fri, 12 Sep 2025 15:51:18 -0700 Subject: Temporarily switch nlohmann json to develop branch ...because of https://github.com/nlohmann/json/issues/4756. --- CMakeLists.txt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1378763..ff4b349 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,17 +3,6 @@ cmake_minimum_required(VERSION 3.24) set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) -# For whatever reason, the C++ stdlib is broken on my Mac. -# -# % echo "#include " | c++ -x c++ - -# :1:10: fatal error: 'vector' file not found -# 1 | #include -# | ^~~~~~~~ -# 1 error generated. -if(APPLE) - set(CMAKE_CXX_FLAGS "-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1") -endif() - project(Webdir) option(WEBDIR_BUILD_TESTS "Build unit tests" OFF) @@ -45,7 +34,11 @@ FetchContent_Declare( FetchContent_Declare( json GIT_REPOSITORY https://github.com/nlohmann/json.git - GIT_TAG v3.11.3 + # TODO: Use 3.12.1. + # + # Temporarily swtich to develop because of + # https://github.com/nlohmann/json/issues/4756. + GIT_TAG develop ) FetchContent_Declare( -- cgit v1.2.3-70-g09d2