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

7 files changed, 11 insertions, 12 deletions

diff --git a/src/zen/zen.cpp b/src/zen/zen.cpp
index ad4bb9013..2661f2173 100644
--- a/src/zen/zen.cpp
+++ b/src/zen/zen.cpp
@@ -56,8 +56,6 @@
 #endif
 
 ZEN_THIRD_PARTY_INCLUDES_START
-#include <spdlog/sinks/ansicolor_sink.h>
-#include <spdlog/spdlog.h>
 #include <gsl/gsl-lite.hpp>
 ZEN_THIRD_PARTY_INCLUDES_END
 
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index fcb2afaf7..19152cc97 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -25,6 +25,7 @@ target('zencore')
     end
 
     add_deps("zenbase")
+    add_deps("spdlog")
     add_deps("utfcpp")
     add_deps("oodle")
     add_deps("ue-trace")
@@ -35,8 +36,8 @@ target('zencore')
         "vcpkg::json11",
         "vcpkg::ryml",
         "vcpkg::c4core",
-        "vcpkg::openssl", -- required for crypto
-        "vcpkg::spdlog")
+        "vcpkg::openssl" -- required for crypto
+        )
 
     add_packages(
         "vcpkg::doctest", 
diff --git a/src/zentelemetry/xmake.lua b/src/zentelemetry/xmake.lua
index 2f90d7b90..552d0718a 100644
--- a/src/zentelemetry/xmake.lua
+++ b/src/zentelemetry/xmake.lua
@@ -6,5 +6,5 @@ target('zentelemetry')
     add_headerfiles("**.h")
     add_files("**.cpp")
     add_includedirs("include", {public=true})
-    add_deps("zencore", "protozero")
-    add_packages("vcpkg::robin-map", "vcpkg::spdlog")
+    add_deps("zencore", "protozero", "spdlog")
+    add_packages("vcpkg::robin-map")
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")
diff --git a/src/zenvfs/xmake.lua b/src/zenvfs/xmake.lua
index 032d02219..7f790c2d4 100644
--- a/src/zenvfs/xmake.lua
+++ b/src/zenvfs/xmake.lua
@@ -6,5 +6,5 @@ target('zenvfs')
     add_headerfiles("**.h")
     add_files("**.cpp")
     add_includedirs("include", {public=true})
-    add_deps("zencore")
-    add_packages("vcpkg::spdlog")
+    add_deps("zencore", "spdlog")
+