Use per-config output dir in VS 6 templates

This commit removes use of configuration-less cmTarget::GetDirectory()
by the VS 6 generator (except for compatibility with user templates).
We replace OUTPUT_DIRECTORY_<CONFIG> tokens in the templates using the
per-configuration result of cmTarget::GetDirectory(config).

1 files changed, 8 insertions, 8 deletions

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index 57fad988df..1b5c8bc7d3 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -50,7 +50,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY\Release"

+# PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

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

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS

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

 

 CMAKE_CUSTOM_RULE_CODE_RELEASE

 

@@ -80,7 +80,7 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "OUTPUT_DIRECTORY\Debug"

+# PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_LIB"  /FD /c

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

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Debug/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS

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

 

 CMAKE_CUSTOM_RULE_CODE_DEBUG

 

@@ -110,7 +110,7 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"

+# PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS

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

 

 CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

 

@@ -141,7 +141,7 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"

+# PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

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

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\RelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS

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

 

 CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO