mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 08:25:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Better support for FMT_UNICODE in cmake"

Browse Source 
This reverts commit d373093734.
This commit is contained in:
Gabi Melman 2024-11-01 16:49:37 +02:00
parent d373093734
commit a5cfbf369d
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -33,9 +33,9 @@ elseif(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()
# under msvc make sure __cplusplus, parallel build # under msvc make sure __cplusplus, parallel build and utf-8 enabled
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /MP") string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /MP /utf-8")
endif() endif()
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
@ -283,20 +283,7 @@ if(SPDLOG_NO_EXCEPTIONS)
target_compile_options(spdlog PRIVATE /EHs-c-) target_compile_options(spdlog PRIVATE /EHs-c-)
endif() endif()
endif() endif()
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
# {fmt} lib requires /utf-8 flag or FMT_UNICODE=0 under MSVC
# ---------------------------------------------------------------------------------------
if(NOT SPDLOG_USE_STD_FORMAT)
if(MSVC)
if(SPDLOG_WCHAR_SUPPORT OR SPDLOG_WCHAR_CONSOLE)
target_compile_options(spdlog PUBLIC /utf-8)
else()
target_compile_definitions(spdlog PUBLIC FMT_UNICODE=0)
endif()
endif()
endif()
# Build binaries # Build binaries
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
if(SPDLOG_BUILD_EXAMPLE OR SPDLOG_BUILD_EXAMPLE_HO OR SPDLOG_BUILD_ALL) if(SPDLOG_BUILD_EXAMPLE OR SPDLOG_BUILD_EXAMPLE_HO OR SPDLOG_BUILD_ALL)