From 14861f88d2e33edc53ab00f92dfaaf860f9d4084 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Mon, 19 Nov 2012 20:56:26 +0100 Subject: [PATCH] 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. --- Modules/CMakeDetermineCompilerId.cmake | 3 --- Modules/CompilerId/VS-7.vcproj.in | 1 - 2 files changed, 4 deletions(-) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 906a5e7ba..dd2bcd2dd 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 71bf64de2..bcb18a5b7 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@" />