From 42c36f48ed8d5d64bd244b1097257f575569d472 Mon Sep 17 00:00:00 2001 From: ryan-rsm-mckenzie Date: Sun, 27 Dec 2020 00:47:57 -0800 Subject: [PATCH] ensure SPDLOG_FMT_EXTERNAL is honored throughout whole codebase --- bench/async_bench.cpp | 5 +++++ bench/bench.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bench/async_bench.cpp b/bench/async_bench.cpp index d97146871..c3ee247e2 100644 --- a/bench/async_bench.cpp +++ b/bench/async_bench.cpp @@ -9,7 +9,12 @@ #include "spdlog/spdlog.h" #include "spdlog/async.h" #include "spdlog/sinks/basic_file_sink.h" + +#ifdef SPDLOG_FMT_EXTERNAL +#include +#else #include "spdlog/fmt/bundled/locale.h" +#endif #include "utils.h" #include diff --git a/bench/bench.cpp b/bench/bench.cpp index b7d2fc73e..1abb1aa52 100644 --- a/bench/bench.cpp +++ b/bench/bench.cpp @@ -11,7 +11,12 @@ #include "spdlog/sinks/daily_file_sink.h" #include "spdlog/sinks/null_sink.h" #include "spdlog/sinks/rotating_file_sink.h" + +#ifdef SPDLOG_FMT_EXTERNAL +#include +#else #include "spdlog/fmt/bundled/locale.h" +#endif #include "utils.h" #include