diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-07-30 13:50:29 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-07-30 13:50:29 +0100 |
| commit | 1b0c6048484871b7ec6985783d3f29812f862f92 (patch) | |
| tree | 7c84ff714e1f6eadee9774eda58335faae3ad01e | |
| parent | 394b2c6845535c6305a7e9a35b630f59a3ffaaf7 (diff) | |
Revert "CMake/MSVC: Fix VS 2013 compile -- Zm500 hack is no longer required"
This reverts commit ca7377369f603081259adea0ba49cb03e74e609f.
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 423998f664c..f303b6ed761 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -55,9 +55,7 @@ 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}) -if(MSVC_VERSION LESS 1800) # MSVC2012 and below - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE) -endif() +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE) # 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 |