Merge pull request #1774 from Ryan-rsm-McKenzie/v1.x

skip module mode when finding fmt
2025-01-16 01:37:58 +00:00 · 2020-12-27 14:19:08 +02:00 · 2020-12-27 01:37:12 -08:00 · 2020-12-27 11:17:30 +02:00 · 2020-12-27 00:47:57 -08:00
3 changed files with 11 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -172,7 +172,7 @@ target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
 # ---------------------------------------------------------------------------------------
 if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
    if(NOT TARGET fmt::fmt)
-        find_package(fmt 5.3.0 REQUIRED)
+        find_package(fmt 5.3.0 CONFIG REQUIRED)
    endif()
    target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
--- 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 <fmt/locale.h>
+#else
 #include "spdlog/fmt/bundled/locale.h"
+#endif

 #include "utils.h"
 #include <atomic>
--- 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 <fmt/locale.h>
+#else
 #include "spdlog/fmt/bundled/locale.h"
+#endif

 #include "utils.h"
 #include <atomic>
Author	SHA1	Message	Date
Gabi Melman	aa2053a575	Merge pull request #1774 from Ryan-rsm-McKenzie/v1.x skip module mode when finding fmt	2020-12-27 14:19:08 +02:00
ryan-rsm-mckenzie	3d8f71c4d2	skip module mode when finding fmt	2020-12-27 01:37:12 -08:00
Gabi Melman	6aaaabbc4d	Merge pull request #1773 from Ryan-rsm-McKenzie/v1.x ensure SPDLOG_FMT_EXTERNAL is honored throughout whole codebase	2020-12-27 11:17:30 +02:00
ryan-rsm-mckenzie	42c36f48ed	ensure SPDLOG_FMT_EXTERNAL is honored throughout whole codebase	2020-12-27 00:47:57 -08:00