aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2013-05-18 10:24:04 +0200
committerclick <click@gonnamakeyou.com>2013-05-18 10:24:04 +0200
commit612ead50949f67ced5c656db751d9f3200715224 (patch)
tree02bc66e0e29ea004f0d49840f242eaec0adaa3ea
parent6ce9e7f1852c01cda83198352304680b14619b49 (diff)
Buildsystem/MSVC: Fix a minor issue with /Zm heap allocation parameters not being used 32-bit environment
-rw-r--r--cmake/compiler/msvc/settings.cmake3
1 files changed, 2 insertions, 1 deletions
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