Просмотр исходного кода

VS6: Hardcode id_machine_6 for compiler detection

id_machine6 is never set to an other value than x86. So it is
safe to remove the replacements with "x86" directly.
Patrick Gansterer 12 лет назад
Родитель
Сommit
dfbfe6f166
2 измененных файлов с 3 добавлено и 4 удалено
  1. 0 1
      Modules/CMakeDetermineCompilerId.cmake
  2. 3 3
      Modules/CompilerId/VS-6.dsp.in

+ 0 - 1
Modules/CMakeDetermineCompilerId.cmake

@@ -134,7 +134,6 @@ Id flags: ${testflags}
     elseif("${id_arch}" STREQUAL "ARM")
       set(id_machine_10 MachineARM)
     else()
-      set(id_machine_6 x86)
       set(id_machine_10 MachineX86)
     endif()
     if(CMAKE_VS_PLATFORM_TOOLSET)

+ 3 - 3
Modules/CompilerId/VS-6.dsp.in

@@ -1,7 +1,7 @@
 # Microsoft Developer Studio Project File - Name="CompilerId@id_lang@" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 
-# TARGTYPE "Win32 (@id_machine_6@) Application" 0x0101
+# TARGTYPE "Win32 (x86) Application" 0x0101
 
 CFG=CompilerId@id_lang@ - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -16,7 +16,7 @@ CFG=CompilerId@id_lang@ - Win32 Debug
 !MESSAGE
 !MESSAGE Possible choices for configuration are:
 !MESSAGE
-!MESSAGE "CompilerId@id_lang@ - Win32 Debug" (based on "Win32 (@id_machine_6@) Application")
+!MESSAGE "CompilerId@id_lang@ - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 # PROP Target_Dir ""
 # ADD CPP /nologo /MDd /c
 LINK32=link.exe
-# ADD LINK32 /nologo /version:0.0 /subsystem:console /machine:@id_machine_6@ /out:"CompilerId@[email protected]" /IGNORE:4089
+# ADD LINK32 /nologo /version:0.0 /subsystem:console /machine:x86 /out:"CompilerId@[email protected]" /IGNORE:4089
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=for %%i in (@id_cl@) do @echo CMAKE_@id_lang@_COMPILER=%%~$PATH:i