diff --git a/CMakeLists.txt b/CMakeLists.txt index 00c1a96f0..f5acbc750 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,6 +302,11 @@ endif () # Link libraries +# Link fmt +find_package(fmt REQUIRED) +target_link_libraries(standard fmt::fmt) +list(APPEND PCH_EXTRA ) + # Link Freetype if (NOT USE_CONSOLE) find_package(Freetype REQUIRED) diff --git a/src/StdStringEncodingConverter.cpp b/src/StdStringEncodingConverter.cpp index abc9f51aa..87a452f8f 100644 --- a/src/StdStringEncodingConverter.cpp +++ b/src/StdStringEncodingConverter.cpp @@ -15,11 +15,12 @@ #include "StdStringEncodingConverter.h" -#include #include #include #include +#include + namespace { template @@ -48,7 +49,7 @@ namespace const int convertedSize{ConversionFunc(CP_ACP, 0, input.data(), static_cast(input.size()), nullptr, 0, std::forward(args)...)}; if (!convertedSize) { - throw std::runtime_error{std::format("Querying output size failed: {:x}", GetLastError())}; + throw std::runtime_error{fmt::format("Querying output size failed: {:x}", GetLastError())}; } const auto converted = std::make_unique_for_overwrite(static_cast(convertedSize)); @@ -56,7 +57,7 @@ namespace if (result != convertedSize) { - throw std::runtime_error{std::format("Conversion returned {} when it was expected to return {}", result, convertedSize)}; + throw std::runtime_error{fmt::format("Conversion returned {} when it was expected to return {}", result, convertedSize)}; } return ReturnType{converted.get(), static_cast(convertedSize)};