VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-17 21:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

MDEV-34528: bundle fmt version 11.0.0

Browse Source 
Numerous fixes included from upstream.

/utf8 needed for Windows, but may as well
enable globally.
This commit is contained in:
Daniel Black
2024-07-04 20:38:00 +10:00
parent 4d71a117a3
commit 579450c2c1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/libfmt.cmake
View File

@ -15,8 +15,8 @@ MACRO(BUNDLE_LIBFMT)
ExternalProject_Add( ExternalProject_Add(
libfmt libfmt
PREFIX "${dir}" PREFIX "${dir}"
URL "https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip" URL "https://github.com/fmtlib/fmt/archive/refs/tags/11.0.0.zip"
URL_MD5 e77873199e897ca9f780479ad68e25b1 URL_MD5 f690d14b38d0fa473ea414ecf4e9c1a2
INSTALL_COMMAND "" INSTALL_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""

1
cmake/os/Windows.cmake
View File

@ -273,6 +273,7 @@ IF(MSVC)
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " /d2OptimizeHugeFunctions") STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " /d2OptimizeHugeFunctions")
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " /d2OptimizeHugeFunctions") STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " /d2OptimizeHugeFunctions")
ENDIF() ENDIF()
ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
ENDIF() ENDIF()
# Always link with socket/synchronization libraries # Always link with socket/synchronization libraries