Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-12-11 11:24:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-12-11 11:24:37 +0300
commit4737b95b6519bc1b66a812bab73d4664b3098261 (patch)
tree4249335ad0aabf2d5e28c92f990f8ddc8428a47c /build_files
parenta2f223101490fceea2fa5d58acb4165c6d2d7bc1 (diff)
parentdd4e0cd3e30a88657981064c3f8fcd81612d9394 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake5
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)