Merge branch 'vs-compiler-id-itanium' into release

This commit is contained in:
Brad King 2015-12-21 09:36:11 -05:00
commit cc5dcb3876
1 changed files with 0 additions and 3 deletions

View File

@ -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>")