From e97b1cd759deeb6c2e0b7a6de33d5986ee033b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Tue, 23 Jun 2026 05:11:01 +0200 Subject: [PATCH] fmt: Allow building with version >=12.2.0 This change was causing some issues: > Made FMT_STRING a no-op when FMT_USE_CONSTEVAL is enabled, since the consteval format-string constructor already provides compile-time validation (#4611, #4612). Thanks @friedkeenan. --- Source/Core/Common/Logging/Log.h | 5 +++-- Source/Core/Common/MsgHandler.h | 16 ++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index 64d353af00..62119c8648 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -103,8 +103,9 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, con static_assert(NumFields == sizeof...(args), "Unexpected number of replacement fields in format string; did you pass too few or " "too many arguments?"); - -#if FMT_VERSION >= 110000 +#if FMT_VERSION >= 110000 && FMT_VERSION < 120200 + // fmt 11 made fmt::string_view no longer directly constructible from compile-time strings. + // In fmt 12.2+, compile-time strings are plain string literals, so this is no longer needed. auto&& format_str = fmt::format_string(format); #else auto&& format_str = format; diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index 4fc7196a97..9c32feeb7f 100644 --- a/Source/Core/Common/MsgHandler.h +++ b/Source/Core/Common/MsgHandler.h @@ -39,7 +39,10 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons static_assert(NumFields == sizeof...(args), "Unexpected number of replacement fields in format string; did you pass too few or " "too many arguments?"); -#if FMT_VERSION >= 110000 + +#if FMT_VERSION >= 120200 + auto&& format_str = format; +#elif FMT_VERSION >= 110000 static_assert(std::is_base_of_v); auto&& format_str = fmt::format_string(format); #elif FMT_VERSION >= 90000 @@ -63,13 +66,14 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con static_assert(NumFields == sizeof...(args), "Unexpected number of replacement fields in format string; did you pass too few or " "too many arguments?"); -#if FMT_VERSION >= 110000 - static_assert(std::is_base_of_v); -#elif FMT_VERSION >= 90000 - static_assert(fmt::detail::is_compile_string::value); -#else +#if FMT_VERSION < 90000 static_assert(fmt::is_compile_string::value); +#elif FMT_VERSION < 110000 + static_assert(fmt::detail::is_compile_string::value); +#elif FMT_VERSION < 120200 + static_assert(std::is_base_of_v); #endif + // FMT 12.2+ guarantees this will be a compile-time string auto arg_list = fmt::make_format_args(args...); return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list); }