[Cmake-commits] CMake branch, next, updated. v2.8.12-3749-g67e986f

[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  67e986f48cb84c0a621fbbec8266ad01fe62ea1e (commit)
       via  d10a5971f1dd40c1bbc914e035a630f4747f70dd (commit)
      from  deb505697402b198295cea87b6f78f37dcc832e9 (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=67e986f48cb84c0a621fbbec8266ad01fe62ea1e
commit 67e986f48cb84c0a621fbbec8266ad01fe62ea1e
Merge: deb5056 d10a597
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 10 09:04:11 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 10 09:04:11 2013 -0400

    Merge topic 'vs-intel-compiler-exe' into next
    
    d10a597 VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d10a5971f1dd40c1bbc914e035a630f4747f70dd
commit d10a5971f1dd40c1bbc914e035a630f4747f70dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 9 13:50:59 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 9 13:50:59 2013 -0400

    VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)
    
    When the platform toolset is from Intel, look for "icl.exe" instead of
    "cl.exe".

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index de4a882..71f15df 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -130,6 +130,9 @@ Id flags: ${testflags}
     endif()
     if(CMAKE_VS_PLATFORM_TOOLSET)
       set(id_toolset "<PlatformToolset>${CMAKE_VS_PLATFORM_TOOLSET}</PlatformToolset>")
+      if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "Intel")
+        set(id_cl icl.exe)
+      endif()
     else()
       set(id_toolset "")
     endif()

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake