瀏覽代碼

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.
Patrick Gansterer 13 年之前
父節點
當前提交
14861f88d2
共有 2 個文件被更改,包括 0 次插入4 次删除
  1. 0 3
      Modules/CMakeDetermineCompilerId.cmake
  2. 0 1
      Modules/CompilerId/VS-7.vcproj.in

+ 0 - 3
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()

+ 0 - 1
Modules/CompilerId/VS-7.vcproj.in

@@ -37,7 +37,6 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
 				SubSystem="1"
-				TargetMachine="@id_machine_7@"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"