[Cmake-commits] CMake branch, next, updated. v2.8.8-2679-g0009f0d

[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  0009f0d64cb722c417f7373215a9285bb6561b3f (commit)
       via  4f80896e6c945239631f5f85e51251b6ed868d0d (commit)
      from  419059b0fc7354f0e72dc43247d864805904610e (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=0009f0d64cb722c417f7373215a9285bb6561b3f
commit 0009f0d64cb722c417f7373215a9285bb6561b3f
Merge: 419059b 4f80896
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 24 09:02:08 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 24 09:02:08 2012 -0400

    Merge topic 'intel-Windows-EHsc' into next
    
    4f80896 Intel: On Windows use /EHsc instead of deprecated /GX (#13163)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f80896e6c945239631f5f85e51251b6ed868d0d
commit 4f80896e6c945239631f5f85e51251b6ed868d0d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 24 08:54:37 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 24 09:00:37 2012 -0400

    Intel: On Windows use /EHsc instead of deprecated /GX (#13163)
    
    Use of the deprecated option with Intel 2011 produces
    
     icl: command line remark #10010: option '/GX' is deprecated and will
     be removed in a future release. See '/help deprecated'
    
    so use its replacement option which has been supported for several
    older versions anyway.

diff --git a/Modules/Platform/Windows-Intel-CXX.cmake b/Modules/Platform/Windows-Intel-CXX.cmake
index 2845b0f..ec5f0ae 100644
--- a/Modules/Platform/Windows-Intel-CXX.cmake
+++ b/Modules/Platform/Windows-Intel-CXX.cmake
@@ -1,4 +1,4 @@
 include(Platform/Windows-Intel)
 set(_COMPILE_CXX " /TP")
-set(_FLAGS_CXX " /GX /GR")
+set(_FLAGS_CXX " /EHsc /GR")
 __windows_compiler_intel(CXX)

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

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


hooks/post-receive
-- 
CMake