From 21410d50afc5d801bd149fa995a32d68cce50767 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 14 Mar 2018 17:21:31 +0100 Subject: [PATCH] :checkered_flag: moved /Wall to CMake --- appveyor.yml | 4 ++-- test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 828c32232..da7037867 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,8 +6,8 @@ os: environment: matrix: - - additional_flags: "/Wall" - - additional_flags: "/permissive- /std:c++latest /utf-8 /Wall" + - additional_flags: "" + - additional_flags: "/permissive- /std:c++latest /utf-8" matrix: exclude: diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e5f6dc55a..6d921e998 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -82,7 +82,7 @@ if(MSVC) # Disable warning C4309: 'static_cast': truncation of constant value # Disable warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252) # Disable warning C4996: 'nlohmann::basic_json::operator <<': was declared deprecated - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4389 /wd4309 /wd4566 /wd4996") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4389 /wd4309 /wd4566 /wd4996 /Wall") endif() #############################################################################