[cmake-commits] king committed DLLHeader.dsptemplate 1.24 1.25 EXEHeader.dsptemplate 1.19 1.20

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Oct 16 18:17:16 EDT 2006


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

Modified Files:
	DLLHeader.dsptemplate EXEHeader.dsptemplate 
Log Message:
ENH: Adding image version number (major.minor) property to windows binaries.  Default is 0.0, but the VERSION target property may change the value.  Windows now has first-class support for dll and exe versioning.  This addresses bug#1219.


Index: DLLHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/DLLHeader.dsptemplate,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- DLLHeader.dsptemplate	19 Apr 2006 14:34:41 -0000	1.24
+++ DLLHeader.dsptemplate	16 Oct 2006 22:17:14 -0000	1.25
@@ -71,7 +71,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"
+# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"
 CM_MULTILINE_OPTIONS_RELEASE
 
 CMAKE_CUSTOM_RULE_CODE
@@ -103,7 +103,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept
+# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept
 CM_MULTILINE_OPTIONS_DEBUG
 
 CMAKE_CUSTOM_RULE_CODE
@@ -137,7 +137,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32  /nologo /dll /machine:I386 
-# ADD LINK32 /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"
+# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"
 CM_MULTILINE_OPTIONS_MINSIZEREL
 
 CMAKE_CUSTOM_RULE_CODE
@@ -169,7 +169,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"
+# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"
 CM_MULTILINE_OPTIONS_RELWITHDEBINFO
 
 CMAKE_CUSTOM_RULE_CODE

Index: EXEHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEHeader.dsptemplate,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- EXEHeader.dsptemplate	19 Apr 2006 14:34:41 -0000	1.19
+++ EXEHeader.dsptemplate	16 Oct 2006 22:17:14 -0000	1.20
@@ -68,7 +68,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089
-# ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089
+# ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"
 CM_MULTILINE_OPTIONS_RELEASE
 
@@ -100,7 +100,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32  /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"
 CM_MULTILINE_OPTIONS_DEBUG
 
@@ -129,7 +129,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"
 CM_MULTILINE_OPTIONS_MINSIZEREL
 
@@ -159,7 +159,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
-# ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
+# ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
 CM_MULTILINE_OPTIONS_RELWITHDEBINFO
 



More information about the Cmake-commits mailing list