ENH: Implemented use of cmTarget::GetDirectory() in Visual Studio 6 generator. This is an incremental fix for bug#4210.

1 files changed, 9 insertions, 9 deletions

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index ed80c7a..bd743d6 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -11,7 +11,7 @@
 # variables to REPLACE

 # 

 # BUILD_INCLUDES == include path

-# EXECUTABLE_OUTPUT_PATH == override in output directory

+# OUTPUT_DIRECTORY == override in output directory

 # EXTRA_DEFINES == compiler defines

 # OUTPUT_LIBNAME  == name of output library

 # CM_LIBRARIES == libraries linked in 

@@ -53,7 +53,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"

+# PROP Output_Dir "OUTPUT_DIRECTORY\Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

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

@@ -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 TARGET_VERSION_FLAG

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

+# ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE"

 CM_MULTILINE_OPTIONS_RELEASE

 

 CMAKE_CUSTOM_RULE_CODE

@@ -83,7 +83,7 @@ CMAKE_CUSTOM_RULE_CODE
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"

+# PROP Output_Dir "OUTPUT_DIRECTORY\Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE"  /FD /GZ /c

@@ -101,7 +101,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 TARGET_VERSION_FLAG

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

+# ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG"

 CM_MULTILINE_OPTIONS_DEBUG

 

 CMAKE_CUSTOM_RULE_CODE

@@ -114,7 +114,7 @@ CMAKE_CUSTOM_RULE_CODE
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel"

+# PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Target_Dir ""

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

@@ -130,7 +130,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 TARGET_VERSION_FLAG

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

+# ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL"

 CM_MULTILINE_OPTIONS_MINSIZEREL

 

 CMAKE_CUSTOM_RULE_CODE

@@ -144,7 +144,7 @@ CMAKE_CUSTOM_RULE_CODE
 # PROP BASE Target_Dir ""

 # PROP Use_MFC CMAKE_MFC_FLAG

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo"

+# PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Target_Dir ""

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

@@ -160,7 +160,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 TARGET_VERSION_FLAG

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

+# ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"

 CM_MULTILINE_OPTIONS_RELWITHDEBINFO

 

 CMAKE_CUSTOM_RULE_CODE