summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-01-07 18:28:14 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-01-07 18:28:14 (GMT)
commit1c646e4839418d51e1c9673929d55021f2ed9865 (patch)
tree0e81262d67b6b8e46f73cb458d367d4ccd311daa /Modules
parentb021455e40f921ab3887dec8cde665838b92bd66 (diff)
parentd9bf5206d007507fff3e1a89b8f49d7960a209c8 (diff)
downloadCMake-1c646e4839418d51e1c9673929d55021f2ed9865.zip
CMake-1c646e4839418d51e1c9673929d55021f2ed9865.tar.gz
CMake-1c646e4839418d51e1c9673929d55021f2ed9865.tar.bz2
Merge topic 'vs-compiler-id-itanium'
d9bf5206 CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index eb54814..feae1c4 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -183,9 +183,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>")