diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 10:57:58 (GMT) |
|---|---|---|
| committer | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 11:38:26 (GMT) |
| commit | b02f09d4348afedbf9bd6d579344573e3b08b99f (patch) | |
| tree | 63952ab64928dad62bea525e0b7020d0c0d05413 /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 4b15dc855d8f5347169391b6a1a86320f2efaae4 (diff) | |
| download | CMake-b02f09d4348afedbf9bd6d579344573e3b08b99f.zip CMake-b02f09d4348afedbf9bd6d579344573e3b08b99f.tar.gz CMake-b02f09d4348afedbf9bd6d579344573e3b08b99f.tar.bz2 | |
VS: Replace ArchitectureId with PlatformName
Since we do not need the information about the target architecture
we can use the PlatformName only to specify the this information.
This also removes setting of the MSVC_*_ARCHITECTURE_ID variable
which is not required, because this variable gets set by the
compiler detection code in CMAKE_DETERMINE_COMPILER_ID_CHECK().
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index dc70dc6..9f2c797 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -109,7 +109,7 @@ Id flags: ${testflags} # Compile the compiler identification source. if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)") set(vs_version ${CMAKE_MATCH_1}) - set(id_arch ${CMAKE_VS_PLATFORM_NAME}) + set(id_platform ${CMAKE_VS_PLATFORM_NAME}) set(id_lang "${lang}") set(id_cl cl.exe) if(NOT "${vs_version}" VERSION_LESS 10) @@ -123,8 +123,8 @@ Id flags: ${testflags} set(v 6) set(ext dsp) endif() - if("${id_arch}" STREQUAL "Itanium") - set(id_arch ia64) + if("${id_platform}" STREQUAL "Itanium") + set(id_platform ia64) endif() if(CMAKE_VS_PLATFORM_TOOLSET) set(id_toolset "<PlatformToolset>${CMAKE_VS_PLATFORM_TOOLSET}</PlatformToolset>") @@ -138,7 +138,7 @@ Id flags: ${testflags} set(id_subsystem 1) endif() if("${CMAKE_MAKE_PROGRAM}" MATCHES "[Mm][Ss][Bb][Uu][Ii][Ll][Dd]") - set(build /p:Configuration=Debug /p:Platform=@id_arch@ /p:VisualStudioVersion=${vs_version}.0) + set(build /p:Configuration=Debug /p:Platform=@id_platform@ /p:VisualStudioVersion=${vs_version}.0) elseif("${CMAKE_MAKE_PROGRAM}" MATCHES "[Mm][Ss][Dd][Ee][Vv]") set(build /make) else() |