j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🏁 moved /Wall to CMake

Browse source
This commit is contained in:
Niels Lohmann 2018-03-14 17:21:31 +01:00
parent 829ed74d66
commit 21410d50af
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appveyor.yml
View file

@ -6,8 +6,8 @@ os:
environment: environment:
matrix: matrix:
- additional_flags: "/Wall" - additional_flags: ""
- additional_flags: "/permissive- /std:c++latest /utf-8 /Wall" - additional_flags: "/permissive- /std:c++latest /utf-8"
matrix: matrix:
exclude: exclude:

2
test/CMakeLists.txt
View file

@ -82,7 +82,7 @@ if(MSVC)
# Disable warning C4309: 'static_cast': truncation of constant value # 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 C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252)
# Disable warning C4996: 'nlohmann::basic_json<std::map,std::vector,std::string,bool,int64_t,uint64_t,double,std::allocator,nlohmann::adl_serializer>::operator <<': was declared deprecated # Disable warning C4996: 'nlohmann::basic_json<std::map,std::vector,std::string,bool,int64_t,uint64_t,double,std::allocator,nlohmann::adl_serializer>::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() endif()
############################################################################# #############################################################################