summaryrefslogtreecommitdiff
path: root/src/cmake/compiler
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2017-12-21 11:26:43 +0100
committerYehonal <yehonal.azeroth@gmail.com>2017-12-21 11:26:43 +0100
commit403ed2600f39c1105b6641086808a6cdafbca1c5 (patch)
tree0422298438422af22f3f0723dfa62f66e10510f1 /src/cmake/compiler
parentacd60005e833efee3a10a2f1a4aee7ecced4cc97 (diff)
parenta0d17509a2c0b06d9e74c01d3fe7dc4df2c5c9a7 (diff)
Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk into dir-restructure
Diffstat (limited to 'src/cmake/compiler')
-rw-r--r--src/cmake/compiler/msvc/settings.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmake/compiler/msvc/settings.cmake b/src/cmake/compiler/msvc/settings.cmake
index caca79ee37..7ce1f7f200 100644
--- a/src/cmake/compiler/msvc/settings.cmake
+++ b/src/cmake/compiler/msvc/settings.cmake
@@ -59,7 +59,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})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500")
# 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