diff -u -3 -p -r1.27 cmLocalVisualStudio7Generator.cxx
--- cmLocalVisualStudio7Generator.cxx	3 Jul 2003 16:50:41 -0000	1.27
+++ cmLocalVisualStudio7Generator.cxx	23 Jul 2003 13:50:55 -0000
@@ -225,14 +225,23 @@ void cmLocalVisualStudio7Generator::Writ
   // 1 == executable
   // 10 == utility 
   const char* configType = "10";
+  std::string libDebugPostfix = "";
+  if (m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX"))
+    {
+    libDebugPostfix = m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
+    }
+
+  std::string debugPostfix = "";
   switch(target.GetType())
     { 
     case cmTarget::STATIC_LIBRARY:
       configType = "4";
+	  debugPostfix = libDebugPostfix;
       break;
     case cmTarget::SHARED_LIBRARY:
     case cmTarget::MODULE_LIBRARY:
       configType = "2";
+	  debugPostfix = libDebugPostfix;
       break;
     case cmTarget::EXECUTABLE: 
     case cmTarget::WIN32_EXECUTABLE:  
@@ -294,34 +303,67 @@ void cmLocalVisualStudio7Generator::Writ
 // InlineFunctionExpansion = 1 when inline keyword
 // InlineFunctionExpansion = 2 any time you can
 
   if(strcmp(configName, "Debug") == 0)
     {
     fout << "\t\t\t\tOptimization=\"0\"\n"
          << "\t\t\t\tRuntimeLibrary=\"3\"\n"
-         << "\t\t\t\tInlineFunctionExpansion=\"0\"\n"
-         << "\t\t\t\tPreprocessorDefinitions=\"WIN32,_DEBUG,_WINDOWS";
+         << "\t\t\t\tRuntimeLibrary=\"" << runtimeLibraryDebug << "\"\n"
+         << "\t\t\t\tInlineFunctionExpansion=\"0\"\n";
+    std::string temp = m_LibraryOutputPath;
+    temp += "$(OutDir)/";
+    temp += libName;
+    temp += debugPostfix;
+    temp += ".pdb";
+    fout << "\t\t\t\tProgramDatabaseFileName=\"" << 
+	this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
+    fout << "\t\t\t\tPreprocessorDefinitions=\"WIN32,_DEBUG,_WINDOWS";
     }
   else if(strcmp(configName, "Release") == 0)
     {
     fout << "\t\t\t\tOptimization=\"2\"\n"
          << "\t\t\t\tRuntimeLibrary=\"2\"\n"
-         << "\t\t\t\tInlineFunctionExpansion=\"1\"\n"
-         << "\t\t\t\tPreprocessorDefinitions=\"WIN32,NDEBUG,_WINDOWS";
+         << "\t\t\t\tRuntimeLibrary=\"" << runtimeLibraryRelease << "\"\n"
+         << "\t\t\t\tInlineFunctionExpansion=\"1\"\n";
+	
+    std::string temp = m_LibraryOutputPath;
+    temp += "$(OutDir)/";
+    temp += libName;
+    temp += ".pdb";
+    fout << "\t\t\t\tProgramDatabaseFileName=\"" << 
+	this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
+    fout << "\t\t\t\tPreprocessorDefinitions=\"WIN32,NDEBUG,_WINDOWS";
     }
   else if(strcmp(configName, "MinSizeRel") == 0)
     {
     fout << "\t\t\t\tOptimization=\"1\"\n"
          << "\t\t\t\tRuntimeLibrary=\"2\"\n"
-         << "\t\t\t\tInlineFunctionExpansion=\"1\"\n"
-         << "\t\t\t\tPreprocessorDefinitions=\"WIN32,NDEBUG,_WINDOWS";
+         << "\t\t\t\tRuntimeLibrary=\"" << runtimeLibraryRelease << "\"\n"
+         << "\t\t\t\tInlineFunctionExpansion=\"1\"\n";
+    std::string temp = m_LibraryOutputPath;
+    temp += "$(OutDir)/";
+    temp += libName;
+    temp += ".pdb";
+    fout << "\t\t\t\tProgramDatabaseFileName=\"" << 
+	this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
+    fout << "\t\t\t\tPreprocessorDefinitions=\"WIN32,NDEBUG,_WINDOWS";
     }
   else if(strcmp(configName, "RelWithDebInfo") == 0)
     {
     fout << "\t\t\t\tOptimization=\"2\"\n"
          << "\t\t\t\tRuntimeLibrary=\"2\"\n"
-         << "\t\t\t\tInlineFunctionExpansion=\"1\"\n"
-         << "\t\t\t\tPreprocessorDefinitions=\"WIN32,NDEBUG,_WINDOWS";
+         << "\t\t\t\tRuntimeLibrary=\"" << runtimeLibraryRelease << "\"\n"
+         << "\t\t\t\tInlineFunctionExpansion=\"1\"\n";
+    std::string temp = m_LibraryOutputPath;
+    temp += "$(OutDir)/";
+    temp += libName;
+    temp += ".pdb";
+    fout << "\t\t\t\tProgramDatabaseFileName=\"" << 
+	this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
+    fout << "\t\t\t\tPreprocessorDefinitions=\"WIN32,NDEBUG,_WINDOWS";
     }
   if(target.GetType() == cmTarget::SHARED_LIBRARY
      || target.GetType() == cmTarget::MODULE_LIBRARY)

diff -r --exclude=CVS CMake/Source/cmLocalVisualStudio7Generator.cxx CMake-dev/Source/cmLocalVisualStudio7Generator.cxx
430a431
> 
448a450,469
> 
>   if(target.GetType() == cmTarget::SHARED_LIBRARY
> 	 || target.GetType() == cmTarget::MODULE_LIBRARY
> 	 || target.GetType() == cmTarget::STATIC_LIBRARY)
> 	  {
> 		  std::string debugPostfix = "";
> 		  bool debug = !strcmp(configName,"Debug");
> 		  if(debug && m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX"))
> 			  {
> 				  debugPostfix = m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
> 			  }  
> 		  std::string temp = m_LibraryOutputPath;
> 		  temp += "$(OutDir)/";
> 		  temp += libName;
> 		  temp += debugPostfix;
> 		  temp += ".pdb";
> 		  fout << "\t\t\t\tProgramDatabaseFileName=\"" << 
> 			  this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
> 	  }
>