From 612ead50949f67ced5c656db751d9f3200715224 Mon Sep 17 00:00:00 2001 From: click Date: Sat, 18 May 2013 10:24:04 +0200 Subject: Buildsystem/MSVC: Fix a minor issue with /Zm heap allocation parameters not being used 32-bit environment --- cmake/compiler/msvc/settings.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index d758d466407..2730d9071fa 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -54,7 +54,8 @@ endif() # 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}) +string(REGEX REPLACE "/Zm[0-9]+ *" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +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 -- cgit v1.2.3