diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 12 | ||||
| -rw-r--r-- | cmake/genrev.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/CheckBuildDir.cmake | 2 | ||||
| -rw-r--r-- | cmake/options.cmake | 2 |
4 files changed, 12 insertions, 6 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") diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index b1112d13c12..c7a188d1993 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake index d67f930df99..3cc56dae47b 100644 --- a/cmake/macros/CheckBuildDir.cmake +++ b/cmake/macros/CheckBuildDir.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/options.cmake b/cmake/options.cmake index 11ebe6ddd12..5fefbe34350 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without |