diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fdf2743..ca2fb10d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ ExternalProject_Add(testing-plugins ExternalProject_Add(spdlog PREFIX "external" - URL "https://github.com/gabime/spdlog/archive/v0.17.0.tar.gz" + URL "https://github.com/gabime/spdlog/archive/v1.0.0.tar.gz" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "") diff --git a/src/api/helpers/logging.h b/src/api/helpers/logging.h index 4595da1c..113d0d2a 100644 --- a/src/api/helpers/logging.h +++ b/src/api/helpers/logging.h @@ -25,6 +25,7 @@ #define LOOT_API_HELPERS_LOGGING #include +#include #include "loot/enum/log_level.h" @@ -42,11 +43,11 @@ public: } protected: - void _sink_it(const spdlog::details::log_msg& msg) override { - callback(mapFromSpdlog(msg.level), msg.raw.str().c_str()); + void sink_it_(const spdlog::details::log_msg& msg) override { + callback(mapFromSpdlog(msg.level), fmt::to_string(msg.raw).c_str()); } - void _flush() override {} + void flush_() override {} private: std::function callback; diff --git a/src/api/sorting/plugin_sorter.h b/src/api/sorting/plugin_sorter.h index 208ea38e..29b8624e 100644 --- a/src/api/sorting/plugin_sorter.h +++ b/src/api/sorting/plugin_sorter.h @@ -25,6 +25,8 @@ #ifndef LOOT_API_SORTING_PLUGIN_SORTER #define LOOT_API_SORTING_PLUGIN_SORTER +#define FMT_NO_FMT_STRING_ALIAS + #include #include