[Bf-blender-cvs] [c5689851186] master: MSVC: Fix compiling with some system languages
Campbell Barton
noreply at git.blender.org
Sun Dec 10 05:22:43 CET 2017
Commit: c5689851186392407eab3ce3801db3270ce84cb6
Author: Campbell Barton
Date: Sun Dec 10 15:12:31 2017 +1100
Branches: master
https://developer.blender.org/rBc5689851186392407eab3ce3801db3270ce84cb6
MSVC: Fix compiling with some system languages
Report from @cyaoeu that compiling failed for Japanese system language.
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 146412e556b..4b444e63ebd 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -52,6 +52,11 @@ macro(find_package_wrapper)
endmacro()
add_definitions(-DWIN32)
+
+# Needed, otherwise system encoding causes utf-8 encoding to fail in some cases (C4819)
+add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+
# Minimum MSVC Version
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
if(MSVC_VERSION EQUAL 1800)
More information about the Bf-blender-cvs
mailing list