From 1c12f1511ba4eab930b2a7cde584a3534a273d14 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Thu, 21 Sep 2023 11:58:39 -0400 Subject: [PATCH] build: use Boost 1.82 and link Boost.Json (#4632) Add Boost::json to the list of linked Boost libraries. This seems to be required for macOS. --- Builds/CMake/conan/Boost.cmake | 4 +++- Builds/CMake/deps/Boost.cmake | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Builds/CMake/conan/Boost.cmake b/Builds/CMake/conan/Boost.cmake index 161ab20c5..d73cc2797 100644 --- a/Builds/CMake/conan/Boost.cmake +++ b/Builds/CMake/conan/Boost.cmake @@ -6,6 +6,7 @@ find_package(Boost 1.83 REQUIRED coroutine date_time filesystem + json program_options regex system @@ -29,6 +30,7 @@ target_link_libraries(ripple_boost Boost::coroutine Boost::date_time Boost::filesystem + Boost::json Boost::program_options Boost::regex Boost::system @@ -48,4 +50,4 @@ if(san AND is_clang) INTERFACE # ignore boost headers for sanitizing -fsanitize-blacklist=${CMAKE_CURRENT_BINARY_DIR}/san_bl.txt) -endif() \ No newline at end of file +endif() diff --git a/Builds/CMake/deps/Boost.cmake b/Builds/CMake/deps/Boost.cmake index 6469ba15d..1d0c57ae2 100644 --- a/Builds/CMake/deps/Boost.cmake +++ b/Builds/CMake/deps/Boost.cmake @@ -54,6 +54,7 @@ find_package(Boost 1.86 REQUIRED coroutine date_time filesystem + json program_options regex system @@ -77,6 +78,7 @@ target_link_libraries(ripple_boost Boost::coroutine Boost::date_time Boost::filesystem + Boost::json Boost::iostreams Boost::program_options Boost::regex