Force Visual C++ to treat source files as UTF-8.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ceba9888818c4e895325628e2a5a0716903200c..20af01fffea0d27a8b888608badedc5e2a8a3867 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,6 +358,16 @@ if(NOT WITH_CODE_COVERAGE AND NOT MSVC AND NOT CMAKE_C_FLAGS MATCHES "([\\/\\-]O
         CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 endif()
 
+# Force Visual C++ to use UTF-8
+if(MSVC)
+    if (NOT CMAKE_C_FLAGS MATCHES "[\\/\\-]utf-8")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+    endif()
+    if (NOT CMAKE_CXX_FLAGS MATCHES "[\\/\\-]utf-8")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
+    endif()
+endif()
+
 #
 # Check for standard/system includes
 #

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 041b658dbb2058467351379fa66017b1bbc01f19..ca1d3ea94229dfc5e726cd693da77baafc4206a7 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -204,10 +204,7 @@ if(WITH_GTEST)
         configure_test_executable(gtest_zlib)
 
         if(MSVC)
-            target_compile_options(gtest_zlib PRIVATE /wd4389)
-            if(BASEARCH_ARM_FOUND)
-                target_compile_options(gtest_zlib PRIVATE /EHsc)
-            endif()
+            target_compile_options(gtest_zlib PRIVATE /wd4389 /EHsc)
         endif()
 
         if(WITH_SANITIZER STREQUAL "Memory")