Skip to content

Commit bf99cd5

Browse files
committed
Move to set(CMAKE_CXX_FLAGS ...)
1 parent 2bca9e1 commit bf99cd5

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ set(CMAKE_CXX_STANDARD 20)
44
set(CMAKE_CXX_STANDARD_REQUIRED ON)
55
set(CMAKE_CXX_EXTENSIONS OFF)
66

7-
# Add /utf-8 flag for MSVC to support Unicode in fmt library
8-
if(MSVC)
9-
add_compile_options(/utf-8)
10-
# Ensure it applies to all targets including subprojects
11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
12-
endif()
137

148
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
159
message(FATAL_ERROR "In-source builds are not allowed.
@@ -275,6 +269,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
275269
# using Visual Studio C++
276270
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp
277271
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h
272+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8") # support Unicode in fmt library
278273
add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
279274
add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
280275
add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation

0 commit comments

Comments
 (0)