kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Patrick Gansterer 2012-11-19 20:56:26 +01:00
parent 8faf4e9380
commit 14861f88d2
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeDetermineCompilerId.cmake
View File

@ -124,16 +124,13 @@ Id flags: ${testflags}
set(ext dsp) set(ext dsp)
endif() endif()
if("${vs_arch}" STREQUAL "Win64") if("${vs_arch}" STREQUAL "Win64")
set(id_machine_7 17)
set(id_machine_10 MachineX64) set(id_machine_10 MachineX64)
set(id_arch x64) set(id_arch x64)
elseif("${vs_arch}" STREQUAL "IA64") elseif("${vs_arch}" STREQUAL "IA64")
set(id_machine_7 5)
set(id_machine_10 MachineIA64) set(id_machine_10 MachineIA64)
set(id_arch ia64) set(id_arch ia64)
else() else()
set(id_machine_6 x86) set(id_machine_6 x86)
set(id_machine_7 1)
set(id_machine_10 MachineX86) set(id_machine_10 MachineX86)
set(id_arch Win32) set(id_arch Win32)
endif() endif()

1
Modules/CompilerId/VS-7.vcproj.in
View File

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