Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 11 Dec 2017 08:24:37 +0000 (19:24 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 11 Dec 2017 08:24:37 +0000 (19:24 +1100)
build_files/cmake/platform/platform_win32.cmake

index a38dcbef3c7bf1ca144cf879832b4681327bd62b..d59e9d709220fc79f51eead644bf9940a9cfef83 100644 (file)
@@ -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)