[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2369-gdb50058

[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  db500588a2c39567e3bdaf32b078709fafb2e2a0 (commit)
       via  308c5a2670a7551c00637d481c111ef345d3ae3c (commit)
       via  2ea18eb0c70a0fbb5061b0f7215c40d5eade5447 (commit)
       via  368bd3d3466574661489ae143ef4e9c1b85cdeda (commit)
       via  0d859272106289fd8ac078c6366e591a2030bb13 (commit)
       via  567a7af31170aeeb9cc3f420ae2173b021031335 (commit)
      from  3828e7fe0b89cd2322ea58e41932c9884feb39da (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=db500588a2c39567e3bdaf32b078709fafb2e2a0
commit db500588a2c39567e3bdaf32b078709fafb2e2a0
Merge: 3828e7f 308c5a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 4 08:19:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 4 08:19:33 2013 -0500

    Merge topic 'vs10-stack-size' into next
    
    308c5a2 VS 10: Fix CMAKE_<LANG>_STACK_SIZE implementation (#13968)
    2ea18eb CMake Nightly Date Stamp
    368bd3d CMake Nightly Date Stamp
    0d85927 CMake Nightly Date Stamp
    567a7af CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=308c5a2670a7551c00637d481c111ef345d3ae3c
commit 308c5a2670a7551c00637d481c111ef345d3ae3c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 4 08:11:44 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 4 08:18:28 2013 -0500

    VS 10: Fix CMAKE_<LANG>_STACK_SIZE implementation (#13968)
    
    Use the /STACK: flag to pass the value through flag parsing so that the
    generator converts it to the StackReserveSize project file option.  The
    option was accidentally left out by commit 7491f529 (first pass at VS
    10, 2009-06-25).
    
    Suggested-by: goatboy160 at yahoo.com

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 171ed9a..f4984c7 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1390,7 +1390,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string flags;
   if(stackVal)
     {
-    flags += " ";
+    flags += " /STACK:";
     flags += stackVal;
     }
   std::string linkFlagVarBase = "CMAKE_";

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

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake