[Cmake-commits] CMake branch, next, updated. v2.8.10.1-994-gdf18a57

[David Cole]

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  df18a575cf3dabf82bedbbe67fee2b84e481345f (commit)
       via  51af1da3d21b95540888d585fccdaa8d68d1fdd8 (commit)
      from  7e9d5dbbfe49d2fe58633db8028aa68653d9e728 (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=df18a575cf3dabf82bedbbe67fee2b84e481345f
commit df18a575cf3dabf82bedbbe67fee2b84e481345f
Merge: 7e9d5db 51af1da
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 23 12:28:27 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 23 12:28:27 2012 -0500

    Merge topic 'fix-12437-remove-ridiculously-large-default-stack-size-arg' into next
    
    51af1da CMake: Remove "/STACK:10000000" from default linker flags (#12437)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51af1da3d21b95540888d585fccdaa8d68d1fdd8
commit 51af1da3d21b95540888d585fccdaa8d68d1fdd8
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 23 11:41:58 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 23 11:41:58 2012 -0500

    CMake: Remove "/STACK:10000000" from default linker flags (#12437)
    
    Modern apps that use multiple threads do NOT want 10 Megabytes of RAM
    per thread being used for each thread's stack... Just leave off the
    /STACK: argument, and let the compiler use a reasonable default value
    for the stack size.
    
    If existing single-threaded apps require the /STACK: argument because
    they do need a very large stack size, they can add the flag in their
    own CMakeLists files.

diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake
index 58da8c5..8a9d630 100644
--- a/Modules/Platform/Windows-Intel.cmake
+++ b/Modules/Platform/Windows-Intel.cmake
@@ -50,7 +50,7 @@ elseif(MSVC_CXX_ARCHITECTURE_ID)
 elseif(MSVC_Fortran_ARCHITECTURE_ID)
   set(_MACHINE_ARCH_FLAG "/machine:${MSVC_Fortran_ARCHITECTURE_ID}")
 endif()
-set (CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:YES ${_MACHINE_ARCH_FLAG}")
+set (CMAKE_EXE_LINKER_FLAGS_INIT "/INCREMENTAL:YES ${_MACHINE_ARCH_FLAG}")
 set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug")
 set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")
 
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 32dd546..5cbf9ee 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -165,7 +165,7 @@ set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 
 # executable linker flags
 set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
-# set the stack size and the machine type
+# set the machine type
 set(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID})
 if(NOT _MACHINE_ARCH_FLAG)
   set(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID})
@@ -178,7 +178,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE")
   endif()
 endif()
 set (CMAKE_EXE_LINKER_FLAGS_INIT
-    "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}")
+    "${CMAKE_EXE_LINKER_FLAGS_INIT} /machine:${_MACHINE_ARCH_FLAG}")
 
 # add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype
 # on versions that support it

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

Summary of changes:
 Modules/Platform/Windows-Intel.cmake |    2 +-
 Modules/Platform/Windows-MSVC.cmake  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake