From 2c11bfd67894a1b92de12a94691aabe3b9c715d8 Mon Sep 17 00:00:00 2001 From: Nicholas Dudfield Date: Mon, 8 Sep 2025 16:10:57 +0700 Subject: [PATCH] simplify: remove conan check for enhanced logging Since Xahau now exclusively uses Conan for builds, we can remove the conditional check for conan_toolchain. The enhanced logging feature now simply defaults to ON for Debug builds and OFF for Release builds. --- CMakeLists.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d56c5c780..9a31d4931 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,18 +37,12 @@ endif() #git set(SOURCE_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/") add_definitions(-DSOURCE_ROOT_PATH="${SOURCE_ROOT_PATH}") -# BEAST_ENHANCED_LOGGING option - only available with Conan builds that have date-tz +# BEAST_ENHANCED_LOGGING option - adds file:line numbers and formatting to logs # 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() +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" ON) else() - # 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") + option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" OFF) endif() if(BEAST_ENHANCED_LOGGING)