diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2012-12-31 15:26:57 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2012-12-31 15:26:57 +0100 |
| commit | 6317878b6f76fc1b9431520ee6f8cce8d487bd8c (patch) | |
| tree | dafc4ad48d7327ac816714151751bca50549de5c /cmake/compiler | |
| parent | 871f8c800392cdf8739a6bd4808c532ba88e85ea (diff) | |
| parent | edb90f957baa9d9bb83f4477954593117e9fa858 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 0aa5d93a4b3..d758d466407 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -51,6 +51,12 @@ if(NOT WITH_WARNINGS) endif() endif() -# Specify Precompiled Header Memory Allocation Limit -# (Fix a compiler-problem when using PCH - the /Ym flag is adjusted by the compiler in MSVC2012, hence we need to set an upper limit to avoid disrupancies) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500") +# Specify the maximum PreCompiled Header memory allocation limit +# 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 disrupancies) +# (And yes, this is a verified , unresolved bug with MSVC... *sigh*) +string(REPLACE "/Zm1000" "/Zm500" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + +# 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 +# 'virtual_function' : no override available for virtual member function from base 'class'; function is hidden +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4263 /we4264") |