[cmake-commits] king committed cmLocalVisualStudio7Generator.cxx 1.179 1.180

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv16569

Modified Files:
	cmLocalVisualStudio7Generator.cxx 
Log Message:
BUG: All executable and library project types should specify a program database file name for all configurations.  Even when debug information is not used the .pdb file specified is used to construct the name of a .idb file that exists for all configurations when building with the VS IDE.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- cmLocalVisualStudio7Generator.cxx	12 Mar 2007 16:35:11 -0000	1.179
+++ cmLocalVisualStudio7Generator.cxx	14 Mar 2007 13:34:31 -0000	1.180
@@ -390,7 +390,6 @@
 
   // Check for specific options.
   bool UsingUnicode();
-  bool UsingDebugPDB();
 
   // Write options to output.
   void OutputPreprocessorDefinitions(std::ostream& fout,
@@ -579,12 +578,13 @@
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tAssemblerListingLocation=\"" << configName << "\"\n";
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(targetOptions.UsingDebugPDB() &&
-     (target.GetType() == cmTarget::EXECUTABLE ||
-      target.GetType() == cmTarget::STATIC_LIBRARY ||
-      target.GetType() == cmTarget::SHARED_LIBRARY ||
-      target.GetType() == cmTarget::MODULE_LIBRARY))
+  if(target.GetType() == cmTarget::EXECUTABLE ||
+     target.GetType() == cmTarget::STATIC_LIBRARY ||
+     target.GetType() == cmTarget::SHARED_LIBRARY ||
+     target.GetType() == cmTarget::MODULE_LIBRARY)
     {
+    // We need to specify a program database file name even for
+    // non-debug configurations because VS still creates .idb files.
     fout <<  "\t\t\t\tProgramDataBaseFileName=\""
          << target.GetDirectory(configName) << "/"
          << target.GetPDBName(configName) << "\"\n";
@@ -1698,21 +1698,6 @@
 }
 
 //----------------------------------------------------------------------------
-bool cmLocalVisualStudio7GeneratorOptions::UsingDebugPDB()
-{
-  std::map<cmStdString, cmStdString>::iterator mi =
-    this->FlagMap.find("DebugInformationFormat");
-  if(mi != this->FlagMap.end() && mi->second != "1")
-    {
-    return true;
-    }
-  else
-    {
-    return false;
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmLocalVisualStudio7GeneratorOptions::Parse(const char* flags)
 {
   // Parse the input string as a windows command line since the string