From b5ef68b044466156a8319a656f23518b34768379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 8 Feb 2018 14:59:09 +0100 Subject: [PATCH] Force MSVC to use utf-8 --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3579f0af..8aa47635 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,16 +330,15 @@ if (BUILD_TESTING AND NOT_SUBPROJECT) coverage_evaluate() endif() - # Add desired warnings + # Add per compiler options if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" ) target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code -Wpedantic) if (CATCH_ENABLE_WERROR) target_compile_options( SelfTest PRIVATE -Werror) endif() endif() - # Clang specific warning go here + # Clang specific options go here if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) - # Actually keep these target_compile_options( SelfTest PRIVATE -Wweak-vtables -Wexit-time-destructors -Wglobal-constructors -Wmissing-noreturn ) endif() if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) @@ -348,6 +347,8 @@ if (BUILD_TESTING AND NOT_SUBPROJECT) if (CATCH_ENABLE_WERROR) target_compile_options( SelfTest PRIVATE /WX) endif() + # Force MSVC to consider everything as encoded in utf-8 + target_compile_options( SelfTest PRIVATE /utf-8 ) endif()