diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2013-08-04 15:55:30 (GMT) |
|---|---|---|
| committer | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 11:38:21 (GMT) |
| commit | 60e568cf790705b3ed7a61d6768ba6220bfbabe8 (patch) | |
| tree | 36dd6551cabd8db3e484244d9e3e4c6edcd771c4 | |
| parent | dfbfe6f16629a9bb859b25eacbeeca56513e65df (diff) | |
| download | CMake-60e568cf790705b3ed7a61d6768ba6220bfbabe8.zip CMake-60e568cf790705b3ed7a61d6768ba6220bfbabe8.tar.gz CMake-60e568cf790705b3ed7a61d6768ba6220bfbabe8.tar.bz2 | |
VS10: Do not set the TargetMachine when detecting the compiler
The Microsoft linker is intelligent enough to detect the target
machine type depending on the input files. This allows us to
get the target architecture from the compiler instead of
maintaining the mapping to the platform name.
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 9 | ||||
| -rw-r--r-- | Modules/CompilerId/VS-10.vcxproj.in | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 12b9153..1ecd052 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -126,15 +126,8 @@ Id flags: ${testflags} set(v 6) set(ext dsp) endif() - if("${id_arch}" STREQUAL "x64") - set(id_machine_10 MachineX64) - elseif("${id_arch}" STREQUAL "Itanium") - set(id_machine_10 MachineIA64) + if("${id_arch}" STREQUAL "Itanium") set(id_arch ia64) - elseif("${id_arch}" STREQUAL "ARM") - set(id_machine_10 MachineARM) - else() - set(id_machine_10 MachineX86) endif() if(CMAKE_VS_PLATFORM_TOOLSET) set(id_toolset "<PlatformToolset>${CMAKE_VS_PLATFORM_TOOLSET}</PlatformToolset>") diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in index ab4705f..55b5cdf 100644 --- a/Modules/CompilerId/VS-10.vcxproj.in +++ b/Modules/CompilerId/VS-10.vcxproj.in @@ -40,7 +40,6 @@ <Link> <GenerateDebugInformation>false</GenerateDebugInformation> <SubSystem>Console</SubSystem> - <TargetMachine>@id_machine_10@</TargetMachine> </Link> <PostBuildEvent> <Command>for %%i in (@id_cl@) do %40echo CMAKE_@id_lang@_COMPILER=%%~$PATH:i</Command> |