diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-12-11 11:24:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-11 11:24:37 +0300 |
commit | 4737b95b6519bc1b66a812bab73d4664b3098261 (patch) | |
tree | 4249335ad0aabf2d5e28c92f990f8ddc8428a47c /build_files/cmake | |
parent | a2f223101490fceea2fa5d58acb4165c6d2d7bc1 (diff) | |
parent | dd4e0cd3e30a88657981064c3f8fcd81612d9394 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake')
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index a38dcbef3c7..d59e9d70922 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) |