[Cmake-commits] CMake branch, next, updated. v2.8.10.1-900-g220d5cc

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  220d5ccbb9cf957fd6262981f4b1e03d889ed21f (commit)
       via  cd739794d65e1b0ebcf5fd0d713d3ecc08ee27fc (commit)
       via  c152c65898ef88233ef618a0283a0930e708da5e (commit)
      from  40a4eaa404cd3ee956ee7f2949f720ea1f79568d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=220d5ccbb9cf957fd6262981f4b1e03d889ed21f
commit 220d5ccbb9cf957fd6262981f4b1e03d889ed21f
Merge: 40a4eaa cd73979
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 16 13:02:44 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 16 13:02:44 2012 -0500

    Merge topic 'vs-drop-Zm' into next
    
    cd73979 MSVC: Drop default use of /Zm1000 for VS >= 7.1
    c152c65 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd739794d65e1b0ebcf5fd0d713d3ecc08ee27fc
commit cd739794d65e1b0ebcf5fd0d713d3ecc08ee27fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 16 12:52:59 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 16 12:52:59 2012 -0500

    MSVC: Drop default use of /Zm1000 for VS >= 7.1
    
    From the option documentation of VS >= 7.1:
    
     "In earlier versions of Visual C++, the compiler used several discrete
      heaps, and each had a finite limit. Currently, the compiler dynamically
      grows the heaps as necessary up to a total heap size limit, and requires
      a fixed-size buffer only to construct precompiled headers. Consequently,
      the /Zm compiler option is rarely necessary."
     http://msdn.microsoft.com/en-us/library/bdscwf1c.aspx
    
    Suggested-by: Adam Moss <adam at broadcom.com>

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 1f28c50..32dd546 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -154,6 +154,11 @@ else()
     set(_FLAGS_CXX " /GR /GX")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
   endif()
+
+  if(MSVC_VERSION LESS 1310)
+    set(_FLAGS_C   " /Zm1000${_FLAGS_C}")
+    set(_FLAGS_CXX " /Zm1000${_FLAGS_CXX}")
+  endif()
 endif()
 
 set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
@@ -233,7 +238,7 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_LINK_EXECUTABLE
     "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> /Fd<TARGET_PDB> <OBJECTS> /link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
 
-  set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} /D_WINDOWS /W3 /Zm1000${_FLAGS_${lang}}")
+  set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} /D_WINDOWS /W3${_FLAGS_${lang}}")
   set(CMAKE_${lang}_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od ${_RTC1}")
   set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG")
   set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    7 ++++++-
 Source/CMakeVersion.cmake           |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake