[Cmake-commits] CMake branch, next, updated. v3.4.1-1800-gddbacc2

[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  ddbacc21f0b21abed14bf1ba34437cf03b299f73 (commit)
       via  d9bf5206d007507fff3e1a89b8f49d7960a209c8 (commit)
      from  b6883ac381657dd855dfe9a8cda76b040a225dcf (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=ddbacc21f0b21abed14bf1ba34437cf03b299f73
commit ddbacc21f0b21abed14bf1ba34437cf03b299f73
Merge: b6883ac d9bf520
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 21 09:34:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 21 09:34:42 2015 -0500

    Merge topic 'vs-compiler-id-itanium' into next
    
    d9bf5206 CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9bf5206d007507fff3e1a89b8f49d7960a209c8
commit d9bf5206d007507fff3e1a89b8f49d7960a209c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 21 09:30:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 21 09:34:16 2015 -0500

    CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
    
    VS expects the platform to be just `Itanium`, so drop the incorrect
    special case mapping it to `ia64`.  This platform name has been wrong
    since the logic was added by commit v2.8.10~148^2~8 (VS: Detect the
    compiler id and tool location, 2012-08-16).

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 81c2509..5b3c7f2 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -182,9 +182,6 @@ Id flags: ${testflags}
       set(v 6)
       set(ext dsp)
     endif()
-    if("${id_platform}" STREQUAL "Itanium")
-      set(id_platform ia64)
-    endif()
     if(CMAKE_VS_PLATFORM_TOOLSET)
       if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android")
         set(id_toolset "<NdkToolchainVersion>${CMAKE_VS_PLATFORM_TOOLSET}</NdkToolchainVersion>")

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    3 ---
 1 file changed, 3 deletions(-)


hooks/post-receive
-- 
CMake