[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2133-g0eab448
Brad King
brad.king at kitware.com
Wed Feb 13 13:56:48 EST 2013
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 0eab4482a96ea50f597734b04adc8fb032d02bff (commit)
via 188b0e9e37d6f47b65c60d81a2b07206b3d5488b (commit)
from 2239e56d774ce8f48d84c4fc57e4ae31389ca475 (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=0eab4482a96ea50f597734b04adc8fb032d02bff
commit 0eab4482a96ea50f597734b04adc8fb032d02bff
Merge: 2239e56 188b0e9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 13 13:56:46 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 13 13:56:46 2013 -0500
Merge topic 'Embarcadero-linker-flags' into next
188b0e9 Embarcadero: Fix default link stack/heap flags (#13912)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=188b0e9e37d6f47b65c60d81a2b07206b3d5488b
commit 188b0e9e37d6f47b65c60d81a2b07206b3d5488b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 13 13:19:07 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 13 13:35:25 2013 -0500
Embarcadero: Fix default link stack/heap flags (#13912)
Since commit c70beb4b (change the default borland stack size, 2003-05-05),
commit 1b572eb9 (remove -H flags, 2003-05-08), and commit 2d411398 (Stack size
in generated programs should be 10 meg, 2003-06-12) CMake adds link flags to
select a 10MB stack. At the time this was for consistency with our behavior on
MS, but that was recently removed by commit 51af1da3 (Remove "/STACK:10000000"
from default linker flags, 2012-11-23).
Change our Embarcadero link flags to select the default stack and heap settings
according to the compiler documentation. This is more reliable than leaving
the flags out completely as it has been reported that the linker does not
always use its documented defaults.
Suggested-by: Mathäus Mendel <contato at mathausmendel.com>
diff --git a/Modules/Platform/Windows-Embarcadero.cmake b/Modules/Platform/Windows-Embarcadero.cmake
index 1662ac9..307230e 100644
--- a/Modules/Platform/Windows-Embarcadero.cmake
+++ b/Modules/Platform/Windows-Embarcadero.cmake
@@ -64,7 +64,7 @@ set(CMAKE_CREATE_CONSOLE_EXE "${_tC}" )
set (CMAKE_BUILD_TYPE Debug CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel.")
-set (CMAKE_EXE_LINKER_FLAGS_INIT "${_tM} -lS:10000000 -lSc:10000000 ")
+set (CMAKE_EXE_LINKER_FLAGS_INIT "${_tM} -lS:1048576 -lSc:4098 -lH:1048576 -lHc:8192 ")
set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "-v")
set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "-v")
set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Windows-Embarcadero.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list