From ca7377369f603081259adea0ba49cb03e74e609f Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 19 Jul 2013 00:53:18 +0100 Subject: CMake/MSVC: Fix VS 2013 compile -- Zm500 hack is no longer required Signed-off-by: Nay --- cmake/compiler/msvc/settings.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cmake/compiler/msvc') 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 -- cgit v1.2.3