[Cmake-commits] CMake branch, next, updated. v2.8.8-2748-g361ef9d
Brad King
brad.king at kitware.com
Mon Apr 30 08:33:08 EDT 2012
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 361ef9d96cd4e954e3a528deb59a8f0ece67e9d4 (commit)
via dd08062ac2fa046737e0982a1ca55221923aa20b (commit)
from dd550af8461ccfb0f99dbccb3064b3cd97a2fa44 (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=361ef9d96cd4e954e3a528deb59a8f0ece67e9d4
commit 361ef9d96cd4e954e3a528deb59a8f0ece67e9d4
Merge: dd550af dd08062
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 08:33:06 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 30 08:33:06 2012 -0400
Merge topic 'intel-Windows-RTC1' into next
dd08062 Intel: On Windows use /RTC1 instead of deprecated /GZ (#13174)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd08062ac2fa046737e0982a1ca55221923aa20b
commit dd08062ac2fa046737e0982a1ca55221923aa20b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 08:29:47 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 30 08:29:47 2012 -0400
Intel: On Windows use /RTC1 instead of deprecated /GZ (#13174)
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake
index e7462ba..2a54a98 100644
--- a/Modules/Platform/Windows-Intel.cmake
+++ b/Modules/Platform/Windows-Intel.cmake
@@ -92,7 +92,7 @@ macro(__windows_compiler_intel lang)
set(CMAKE_${lang}_LINK_EXECUTABLE
"<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
set(CMAKE_${lang}_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000${_FLAGS_${lang}}")
- set(CMAKE_${lang}_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Od /GZ")
+ set(CMAKE_${lang}_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Od /RTC1")
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/DNDEBUG /MD /O1")
set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/DNDEBUG /MD /O2")
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/DNDEBUG /MD /Zi /O2")
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Windows-Intel.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list