[Cmake-commits] [cmake-commits] king committed EXEWinHeader.dsptemplate 1.24 1.25

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Templates
In directory public:/mounts/ram/cvs-serv27863/Templates

Modified Files:
	EXEWinHeader.dsptemplate 
Log Message:
Fix Windows GUI implib and image version in VS 6

These commits:

  Adding image version number (major.minor) property to
  windows binaries.

  Added support for import libraries created by executable
  and module targets.

added content to Templates/EXEHeader.dsptemplate that should also have
been added to Templates/EXEWinHeader.dsptemplate for the VS6 generator.
This commit corrects the error.  See issue #9586.


Index: EXEWinHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEWinHeader.dsptemplate,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** EXEWinHeader.dsptemplate	3 Dec 2008 20:35:35 -0000	1.24
--- EXEWinHeader.dsptemplate	25 Sep 2009 19:46:37 -0000	1.25
***************
*** 73,78 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
! # ADD LINK32  /nologo /subsystem:windows /machine:I386  /IGNORE:4089
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE"
  CM_MULTILINE_OPTIONS_RELEASE
  
--- 73,78 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
! # ADD LINK32  /nologo /subsystem:windows /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
***************
*** 107,112 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
! # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG"
  CM_MULTILINE_OPTIONS_DEBUG
  
--- 107,112 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
! # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
***************
*** 138,143 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
! # ADD LINK32 /nologo /subsystem:windows  /machine:I386 /pdbtype:sept /IGNORE:4089
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL"
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
--- 138,143 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
! # ADD LINK32 /nologo /subsystem:windows  /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
***************
*** 172,177 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
! # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386  /IGNORE:4089
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO
  
--- 172,177 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
! # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO