diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-19 13:42:43 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-19 15:26:06 +0200 |
| commit | 2452cfb98ecdc18bd64a118410d2a6dc9505f0c4 (patch) | |
| tree | 0e39b635b9a8cb6418db21e79e9d9c5eb07fc6a6 /cmake/compiler | |
| parent | 3e56a4b8d7340ff75ecdd596516370076419ce2f (diff) | |
| parent | 99dd35da14e7cb0b79f7f70ad393abd6b7a22ea5 (diff) | |
Part 2: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 700ab234d37..b68a0de1ace 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -49,8 +49,8 @@ add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) message(STATUS "MSVC: Disabled POSIX warnings") if(NOT WITH_WARNINGS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619 /wd4800") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619 /wd4512") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619 /wd4512") message(STATUS "MSVC: Disabled generic compiletime warnings") endif() |