[cmake-commits] king committed cmTarget.cxx 1.118 1.119 cmTarget.h 1.68 1.69 cmLocalVisualStudio7Generator.cxx 1.165 1.166

[cmake-commits at cmake.org]

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

Modified Files:
	cmTarget.cxx cmTarget.h cmLocalVisualStudio7Generator.cxx 
Log Message:
ENH: Added cmTarget::GetPDBName method to simplify computation of .pdb file name for a target.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- cmLocalVisualStudio7Generator.cxx	1 Feb 2007 20:44:39 -0000	1.165
+++ cmLocalVisualStudio7Generator.cxx	1 Feb 2007 21:54:49 -0000	1.166
@@ -638,29 +638,17 @@
     {
     if(target.GetType() == cmTarget::EXECUTABLE)
       {
-      std::string targetName;
-      std::string targetNameFull;
-      std::string targetNamePDB;
-      target.GetExecutableNames(targetName, targetNameFull,
-                                targetNamePDB, configName);
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
            << this->ExecutableOutputPath
-           << "$(OutDir)/" << targetNamePDB << "\"\n";
+           << "$(OutDir)/" << target.GetPDBName(configName) << "\"\n";
       }
     else if(target.GetType() == cmTarget::STATIC_LIBRARY ||
             target.GetType() == cmTarget::SHARED_LIBRARY ||
             target.GetType() == cmTarget::MODULE_LIBRARY)
       {
-      std::string targetName;
-      std::string targetNameSO;
-      std::string targetNameFull;
-      std::string targetNameImport;
-      std::string targetNamePDB;
-      target.GetLibraryNames(targetName, targetNameSO, targetNameFull,
-                             targetNameImport, targetNamePDB, configName);
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
            << this->LibraryOutputPath
-           << "$(OutDir)/" << targetNamePDB << "\"\n";
+           << "$(OutDir)/" << target.GetPDBName(configName) << "\"\n";
       }
     }
   fout << "/>\n";  // end of <Tool Name=VCCLCompilerTool

Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- cmTarget.h	1 Feb 2007 14:57:24 -0000	1.68
+++ cmTarget.h	1 Feb 2007 21:54:49 -0000	1.69
@@ -205,6 +205,9 @@
   void GetFullName(std::string& prefix, 
                    std::string& base, std::string& suffix,
                    const char* config=0, bool implib = false);
+
+  /** Get the name of the pdb file for the target.  */
+  std::string GetPDBName(const char* config=0);
   
   /** Get the full path to the target according to the settings in its
       makefile and the configuration type.  */

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- cmTarget.cxx	1 Feb 2007 14:57:24 -0000	1.118
+++ cmTarget.cxx	1 Feb 2007 21:54:49 -0000	1.119
@@ -1376,6 +1376,17 @@
 }
 
 //----------------------------------------------------------------------------
+std::string cmTarget::GetPDBName(const char* config)
+{
+  std::string prefix;
+  std::string base;
+  std::string suffix;
+  this->GetFullNameInternal(this->GetType(), config, false,
+                            prefix, base, suffix);
+  return prefix+base+".pdb";
+}
+
+//----------------------------------------------------------------------------
 std::string cmTarget::GetFullName(const char* config, bool implib)
 {
   return this->GetFullNameInternal(this->GetType(), config, implib);