Merge topic 'vs-compiler-id-itanium'
d9bf5206
CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
This commit is contained in:
commit
1c646e4839
|
@ -183,9 +183,6 @@ Id flags: ${testflags}
|
||||||
set(v 6)
|
set(v 6)
|
||||||
set(ext dsp)
|
set(ext dsp)
|
||||||
endif()
|
endif()
|
||||||
if("${id_platform}" STREQUAL "Itanium")
|
|
||||||
set(id_platform ia64)
|
|
||||||
endif()
|
|
||||||
if(CMAKE_VS_PLATFORM_TOOLSET)
|
if(CMAKE_VS_PLATFORM_TOOLSET)
|
||||||
if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android")
|
if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android")
|
||||||
set(id_toolset "<NdkToolchainVersion>${CMAKE_VS_PLATFORM_TOOLSET}</NdkToolchainVersion>")
|
set(id_toolset "<NdkToolchainVersion>${CMAKE_VS_PLATFORM_TOOLSET}</NdkToolchainVersion>")
|
||||||
|
|
Loading…
Reference in New Issue