diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index efffa89b0..3e4af159b 100644
--- 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)