ENH: Updated VS6 generator to use target.GetFullName() to compute target file names.

4 files changed, 16 insertions, 12 deletions

diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index ae5e506188..59cbeef9e4 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -71,7 +71,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /dll /machine:I386

-# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES  /nologo /dll /machine:I386

+# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES  /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -104,7 +104,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept

 CM_MULTILINE_DEBUG_LIBRARIES

 CM_MULTILINE_LIBRARIES_FOR_DEBUG

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_LIBNAMEDEBUG_POSTFIX.dll" /pdbtype:sept

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -137,7 +137,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32  /nologo /dll /machine:I386 

-# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES  /nologo /dll /machine:I386

+# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES  /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -168,7 +168,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept

-# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"

 

 CMAKE_CUSTOM_RULE_CODE

 

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index 0ee40911d9..203e8ec150 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -69,7 +69,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089

 # ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089

-# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME"

+# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

@@ -102,7 +102,7 @@ BSC32=bscmake.exe
 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 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME"

+# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"

 CM_MULTILINE_DEBUG_LIBRARIES

 CM_MULTILINE_LIBRARIES_FOR_DEBUG

 

@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089

 # ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089

-# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME"

+# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

@@ -163,7 +163,7 @@ BSC32=bscmake.exe
 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 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME"

+# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index 880ad0791e..8a7f7e0658 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -71,6 +71,7 @@ BSC32=bscmake.exe
 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:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

@@ -103,6 +104,7 @@ BSC32=bscmake.exe
 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:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"

 CM_MULTILINE_DEBUG_LIBRARIES

 CM_MULTILINE_LIBRARIES_FOR_DEBUG

 

@@ -133,6 +135,7 @@ BSC32=bscmake.exe
 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:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

@@ -165,6 +168,7 @@ BSC32=bscmake.exe
 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:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index a84900b157..b4d25708c9 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -65,7 +65,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo CM_STATIC_LIB_ARGS

+# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -93,7 +93,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo CM_STATIC_LIB_ARGS /out:"LIBRARY_OUTPUT_PATHDebug\OUTPUT_LIBNAMEDEBUG_POSTFIX.lib"

+# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -122,7 +122,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo CM_STATIC_LIB_ARGS

+# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -150,7 +150,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo CM_STATIC_LIB_ARGS

+# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS

 

 CMAKE_CUSTOM_RULE_CODE