diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2012-11-19 19:56:26 (GMT) |
|---|---|---|
| committer | Patrick Gansterer <paroga@paroga.com> | 2012-11-20 18:15:39 (GMT) |
| commit | 14861f88d2e33edc53ab00f92dfaaf860f9d4084 (patch) | |
| tree | 40ce2b3cc627e4a53f5986ca47d4adad4b70188a | |
| parent | 8faf4e93801a025d4cb17d2ef12437e5554798b1 (diff) | |
| download | CMake-14861f88d2e33edc53ab00f92dfaaf860f9d4084.zip CMake-14861f88d2e33edc53ab00f92dfaaf860f9d4084.tar.gz CMake-14861f88d2e33edc53ab00f92dfaaf860f9d4084.tar.bz2 | |
VS: Remove TargetMachine for linker when checking compiler id
If the TargetMachine isn't defined the linker will choose
the correct target depending on the input file. This helps
us later with additional compiler platforms for WinCE.
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 3 | ||||
| -rw-r--r-- | Modules/CompilerId/VS-7.vcproj.in | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 906a5e7..dd2bcd2 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -124,16 +124,13 @@ Id flags: ${testflags} set(ext dsp) endif() if("${vs_arch}" STREQUAL "Win64") - set(id_machine_7 17) set(id_machine_10 MachineX64) set(id_arch x64) elseif("${vs_arch}" STREQUAL "IA64") - set(id_machine_7 5) set(id_machine_10 MachineIA64) set(id_arch ia64) else() set(id_machine_6 x86) - set(id_machine_7 1) set(id_machine_10 MachineX86) set(id_arch Win32) endif() diff --git a/Modules/CompilerId/VS-7.vcproj.in b/Modules/CompilerId/VS-7.vcproj.in index 71bf64d..bcb18a5 100644 --- a/Modules/CompilerId/VS-7.vcproj.in +++ b/Modules/CompilerId/VS-7.vcproj.in @@ -37,7 +37,6 @@ LinkIncremental="1" GenerateDebugInformation="false" SubSystem="1" - TargetMachine="@id_machine_7@" /> <Tool Name="VCPostBuildEventTool" |