[Cmake-commits] CMake branch, master, updated. v3.10.2-984-ga0c04e7
Kitware Robot
kwrobot at kitware.com
Wed Jan 31 10:55:04 EST 2018
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, master has been updated
via a0c04e71eb2eb4b06c7a4fcfd9be21f9ac6a38ad (commit)
via c7cee1a11e1c18b48d026dfae9fc8a9ddcfa238f (commit)
from e2db8531f1ff1f0ea798023b58517f64a18c995a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0c04e71eb2eb4b06c7a4fcfd9be21f9ac6a38ad
commit a0c04e71eb2eb4b06c7a4fcfd9be21f9ac6a38ad
Merge: e2db853 c7cee1a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 31 15:53:14 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jan 31 10:53:21 2018 -0500
Merge topic 'windows-cmake-stack-size'
c7cee1a1 Windows: Increase stack size used by CMake binaries
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1728
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7cee1a11e1c18b48d026dfae9fc8a9ddcfa238f
commit c7cee1a11e1c18b48d026dfae9fc8a9ddcfa238f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 14:37:23 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 30 14:40:40 2018 -0500
Windows: Increase stack size used by CMake binaries
Deep regex matching logic can exceed the default 1MB stack size. Until
a better regex engine is used, simply push the problem over a farther
horizon by increasing the stack size when built using a MSVC-compatible
linker.
Issue: #17659
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 9834b04..32e7005 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -17,6 +17,10 @@ if(MSVC OR _INTEL_WINDOWS)
else()
endif()
+if(MSVC)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stack:10000000")
+endif()
+
#silence duplicate symbol warnings on AIX
if(CMAKE_SYSTEM_NAME MATCHES "AIX")
if(NOT CMAKE_COMPILER_IS_GNUCXX)
-----------------------------------------------------------------------
Summary of changes:
CompileFlags.cmake | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list