summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-21 09:36:11 -0500
committerBrad King <brad.king@kitware.com>2015-12-21 09:36:11 -0500
commitcc5dcb3876851abb7927367d23085d256a0b3e15 (patch)
treed47600bc69a64347c450ef63d284392a5c3d26df
parenta9e8b123de79a65074dab1944bf80d94dc101b12 (diff)
parentd9bf5206d007507fff3e1a89b8f49d7960a209c8 (diff)
downloadcmake-cc5dcb3876851abb7927367d23085d256a0b3e15.tar.gz
Merge branch 'vs-compiler-id-itanium' into release
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 81c25090c3..5b3c7f2d7b 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>")