diff options
| author | Stefan Boberg <[email protected]> | 2025-10-24 10:19:24 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-24 10:19:24 +0200 |
| commit | 0e21e0d57a5da36f2a4fbbd315254b22cd2fbf00 (patch) | |
| tree | be7c96101bf9c91615f04412c7bafe156a3d6ac8 /src/zenutil | |
| parent | changelog (diff) | |
| download | zen-0e21e0d57a5da36f2a4fbbd315254b22cd2fbf00.tar.xz zen-0e21e0d57a5da36f2a4fbbd315254b22cd2fbf00.zip | |
in-tree spdlog (#602)
move spdlog into the tree to remove dependency on vcpkg::spdlog, to allow diverging from the official version and evolve it to fit better with OTLP logging requirements
Diffstat (limited to 'src/zenutil')
| -rw-r--r-- | src/zenutil/include/zenutil/logging/fullformatter.h | 1 | ||||
| -rw-r--r-- | src/zenutil/include/zenutil/logging/rotatingfilesink.h | 3 | ||||
| -rw-r--r-- | src/zenutil/xmake.lua | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/zenutil/include/zenutil/logging/fullformatter.h b/src/zenutil/include/zenutil/logging/fullformatter.h index 0326870e5..9f245becd 100644 --- a/src/zenutil/include/zenutil/logging/fullformatter.h +++ b/src/zenutil/include/zenutil/logging/fullformatter.h @@ -9,7 +9,6 @@ ZEN_THIRD_PARTY_INCLUDES_START #include <spdlog/formatter.h> -#include <spdlog/pattern_formatter.h> ZEN_THIRD_PARTY_INCLUDES_END namespace zen::logging { diff --git a/src/zenutil/include/zenutil/logging/rotatingfilesink.h b/src/zenutil/include/zenutil/logging/rotatingfilesink.h index cd28bdcb2..5c6c655b8 100644 --- a/src/zenutil/include/zenutil/logging/rotatingfilesink.h +++ b/src/zenutil/include/zenutil/logging/rotatingfilesink.h @@ -7,7 +7,8 @@ ZEN_THIRD_PARTY_INCLUDES_START #include <spdlog/details/log_msg.h> -#include <spdlog/sinks/base_sink.h> +#include <spdlog/pattern_formatter.h> +#include <spdlog/sinks/sink.h> ZEN_THIRD_PARTY_INCLUDES_END #include <filesystem> diff --git a/src/zenutil/xmake.lua b/src/zenutil/xmake.lua index 6d87aefcc..9066ca1ca 100644 --- a/src/zenutil/xmake.lua +++ b/src/zenutil/xmake.lua @@ -6,8 +6,8 @@ target('zenutil') add_headerfiles("**.h") add_files("**.cpp") add_includedirs("include", {public=true}) - add_deps("zencore", "zenhttp") - add_packages("vcpkg::robin-map", "vcpkg::spdlog") + add_deps("zencore", "zenhttp", "spdlog") + add_packages("vcpkg::robin-map") if is_plat("linux") then add_includedirs("$(projectdir)/thirdparty/systemd/include") |