From 016f908f7eeeeaa75c2ef3621b4e2ca35d14f13a Mon Sep 17 00:00:00 2001 From: Nicholas Dudfield Date: Sat, 26 Jul 2025 18:42:55 +0700 Subject: [PATCH] fix: do not support release builder --- CMakeLists.txt | 15 +++++++++++---- src/ripple/basics/impl/Log.cpp | 2 +- src/ripple/beast/utility/EnhancedLogging.h | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16f9ab08b..5a0ed1a04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,11 +37,18 @@ endif() #git set(SOURCE_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/") add_definitions(-DSOURCE_ROOT_PATH="${SOURCE_ROOT_PATH}") -# BEAST_ENHANCED_LOGGING option - default to ON for Debug builds, OFF for Release -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" ON) +# BEAST_ENHANCED_LOGGING option - only available with Conan builds that have date-tz +# Default to ON for Debug builds, OFF for Release +if(CMAKE_TOOLCHAIN_FILE MATCHES "conan_toolchain") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" ON) + else() + option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" OFF) + endif() else() - option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" OFF) + # Non-Conan builds don't have date-tz support + set(BEAST_ENHANCED_LOGGING OFF CACHE BOOL "Enhanced logging requires Conan build" FORCE) + message(STATUS "Enhanced logging disabled - requires Conan build for date-tz support") endif() if(BEAST_ENHANCED_LOGGING) diff --git a/src/ripple/basics/impl/Log.cpp b/src/ripple/basics/impl/Log.cpp index 7efbbb03a..3656ab614 100644 --- a/src/ripple/basics/impl/Log.cpp +++ b/src/ripple/basics/impl/Log.cpp @@ -18,13 +18,13 @@ //============================================================================== #include -#include #include #include #include #ifdef BEAST_ENHANCED_LOGGING #include +#include #endif #include #include diff --git a/src/ripple/beast/utility/EnhancedLogging.h b/src/ripple/beast/utility/EnhancedLogging.h index 9a71a5cee..b51607d8e 100644 --- a/src/ripple/beast/utility/EnhancedLogging.h +++ b/src/ripple/beast/utility/EnhancedLogging.h @@ -85,4 +85,4 @@ log_write_location_string(std::ostream& os, const char* file, int line); } // namespace detail } // namespace beast -#endif \ No newline at end of file +#endif