diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-19 22:33:35 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-19 22:33:35 +0200 |
| commit | d4ac53083f6313ae5c93f70df041b2ccbf8cd18c (patch) | |
| tree | 37cc4400aed3ef687edbc4025b69951b9a989f81 /cmake/compiler/msvc/settings.cmake | |
| parent | 557474f2ae0c393801717ce65656f7b9597ed026 (diff) | |
| parent | 1ac4f0a9c1d6bfd3d0432a76de415feb5349a821 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'cmake/compiler/msvc/settings.cmake')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index f303b6ed761..423998f664c 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -55,7 +55,9 @@ endif() # Fixes a compiler-problem when using PCH - the /Ym flag is adjusted by the compiler in MSVC2012, hence we need to set an upper limit with /Zm to avoid discrepancies) # (And yes, this is a verified , unresolved bug with MSVC... *sigh*) string(REGEX REPLACE "/Zm[0-9]+ *" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE) +if(MSVC_VERSION LESS 1800) # MSVC2012 and below + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE) +endif() # Enable and treat as errors the following warnings to easily detect virtual function signature failures: # 'function' : member function does not override any base class virtual member function |