fixed some of the LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH problems.

Source/cmDSPMakefile.cxx

@@ -550,9 +550,9 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
       cmSystemTools::ReplaceString(line, "BUILD_INCLUDES",
                                    m_IncludeOptions.c_str());
       cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName);
-      cmSystemTools::ReplaceString(line, "OUTPUT_LIBRARY_PATH",
-                                   exePath.c_str());
-      cmSystemTools::ReplaceString(line, "OUTPUT_EXECUTABLE_PATH",
+      cmSystemTools::ReplaceString(line, "LIBRARY_OUTPUT_PATH",
+                                   libPath.c_str());
+      cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATH",
                                    exePath.c_str());
       cmSystemTools::ReplaceString(line, 
                                    "EXTRA_DEFINES", 

Source/cmDSPWriter.cxx

@@ -550,9 +550,9 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
       cmSystemTools::ReplaceString(line, "BUILD_INCLUDES",
                                    m_IncludeOptions.c_str());
       cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName);
-      cmSystemTools::ReplaceString(line, "OUTPUT_LIBRARY_PATH",
-                                   exePath.c_str());
-      cmSystemTools::ReplaceString(line, "OUTPUT_EXECUTABLE_PATH",
+      cmSystemTools::ReplaceString(line, "LIBRARY_OUTPUT_PATH",
+                                   libPath.c_str());
+      cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATH",
                                    exePath.c_str());
       cmSystemTools::ReplaceString(line, 
                                    "EXTRA_DEFINES", 

Templates/DLLHeader.dsptemplate

@@ -31,10 +31,9 @@ CFG=OUTPUT_LIBNAME - Win32 Debug
 # 
 # BUILD_INCLUDES == include path
 # EXTRA_DEFINES == compiler defines
+# LIBRARY_OUTPUT_PATH == override in output directory
 # OUTPUT_LIBNAME  == name of output library
 
-
-
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
@@ -52,7 +51,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "OUTPUT_LIBRARY_PATHRelease"
+# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelease"
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -79,7 +78,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "OUTPUT_LIBRARY_PATHDebug"
+# PROP Output_Dir "LIBRARY_OUTPUT_PATHDebug"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""

Templates/EXEHeader.dsptemplate

@@ -11,6 +11,7 @@
 # variables to REPLACE
 # 
 # BUILD_INCLUDES == include path
+# EXECUTABLE_OUTPUT_PATH == override in output directory
 # EXTRA_DEFINES == compiler defines
 # OUTPUT_LIBNAME  == name of output library
 # CM_LIBRARIES == libraries linked in 
@@ -51,7 +52,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "OUTPUT_EXECUTABLE_PATHRelease"
+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GR /GX /Zm1000 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c
@@ -76,7 +77,7 @@ CM_MULTILINE_LIBRARIES
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "OUTPUT_EXECUTABLE_PATHDebug"
+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP  /W3 /GR /Zm1000 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /GZ /c
@@ -102,7 +103,7 @@ CM_MULTILINE_LIBRARIES
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "OUTPUT_EXECUTABLE_PATHReleaseMinSize"
+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseMinSize"
 # PROP Intermediate_Dir "ReleaseMinSize"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GR /GX /Zm1000 /O1 /Gs /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

Templates/EXEWinHeader.dsptemplate

@@ -11,6 +11,7 @@
 # variables to REPLACE
 # 
 # BUILD_INCLUDES == include path
+# EXECUTABLE_OUTPUT_PATH == override in output directory
 # EXTRA_DEFINES == compiler defines
 # OUTPUT_LIBNAME  == name of output library
 # CM_LIBRARIES == libraries linked in 
@@ -51,7 +52,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "OUTPUT_EXECUTABLE_PATHRelease"
+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GR /GX /Zm1000 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c
@@ -78,7 +79,7 @@ CM_MULTILINE_LIBRARIES
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "OUTPUT_EXECUTABLE_PATHDebug"
+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP  /W3 /GR /Zm1000 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /GZ /c
@@ -100,7 +101,7 @@ CM_MULTILINE_LIBRARIES
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release MinSize"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "OUTPUT_EXECUTABLE_PATHReleaseMinSize"
+# PROP BASE Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseMinSize"
 # PROP BASE Intermediate_Dir "ReleaseMinSize"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

Templates/staticLibHeader.dsptemplate

@@ -12,6 +12,7 @@
 # 
 # BUILD_INCLUDES == include path
 # EXTRA_DEFINES == compiler defines
+# LIBRARY_OUTPUT_PATH == override in output directory
 # OUTPUT_LIBNAME  == name of output library
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -48,7 +49,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "OUTPUT_LIBRARY_PATHRelease"
+# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelease"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"  /FD /c
@@ -71,7 +72,7 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "OUTPUT_LIBRARY_PATHDebug"
+# PROP Output_Dir "LIBRARY_OUTPUT_PATHDebug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB"  /FD /GZ /c
@@ -92,7 +93,7 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "OUTPUT_LIBRARY_PATHReleaseMinSize"
+# PROP Output_Dir "LIBRARY_OUTPUT_PATHReleaseMinSize"
 # PROP Intermediate_Dir "ReleaseMinSize"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""