Use /Zm140 for all windows builds.

2014-08-23 20:50:56 -05:00
parent 315618a18b
commit eb910b0bae
1 changed files with 2 additions and 4 deletions
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -54,10 +54,8 @@ if (WINDOWS)
  # Remove default /Zm1000 flag that cmake inserts
  string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

-  if (MSVC11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm140")
-  endif (MSVC11)
-
+  # Always use /Zm140
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm140")

  # Don't build DLLs.
  set(BUILD_SHARED_LIBS OFF)