[Cmake-commits] [cmake-commits] king committed cmMakefileExecutableTargetGenerator.cxx 1.55 1.56 cmTarget.cxx 1.242 1.243 cmTarget.h 1.124 1.125

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefileExecutableTargetGenerator.cxx cmTarget.cxx 
	cmTarget.h 
Log Message:
ENH: Remove cmTarget::GetExecutableCleanNames

This method was redundant with GetExecutableNames.


Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -C 2 -d -r1.124 -r1.125
*** cmTarget.h	1 May 2009 14:38:34 -0000	1.124
--- cmTarget.h	1 May 2009 14:39:28 -0000	1.125
***************
*** 334,345 ****
                            std::string& pdbName, const char* config);
  
-   /** Get the names of the executable used to remove existing copies
-       of the executable from the build tree either before linking or
-       during a clean step.  This should be called only on an
-       executable target.  */
-   void GetExecutableCleanNames(std::string& name, std::string& realName,
-                                std::string& impName,
-                                std::string& pdbName, const char* config);
- 
    /** Add the target output files to the global generator manifest.  */
    void GenerateTargetManifest(const char* config);
--- 334,337 ----

Index: cmMakefileExecutableTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileExecutableTargetGenerator.cxx,v
retrieving revision 1.55
retrieving revision 1.56
diff -C 2 -d -r1.55 -r1.56
*** cmMakefileExecutableTargetGenerator.cxx	16 Mar 2009 20:55:58 -0000	1.55
--- cmMakefileExecutableTargetGenerator.cxx	1 May 2009 14:39:13 -0000	1.56
***************
*** 254,271 ****
    // may need to be cleaned.
    std::vector<std::string> exeCleanFiles;
!   {
!   std::string cleanName;
!   std::string cleanRealName;
!   std::string cleanImportName;
!   std::string cleanPDBName;
!   this->Target->GetExecutableCleanNames
!     (cleanName, cleanRealName, cleanImportName, cleanPDBName,
!      this->LocalGenerator->ConfigurationName.c_str());
! 
!   std::string cleanFullName = outpath + cleanName;
!   std::string cleanFullRealName = outpath + cleanRealName;
!   std::string cleanFullPDBName = outpath + cleanPDBName;
!   std::string cleanFullImportName = outpathImp + cleanImportName;
!   exeCleanFiles.push_back(this->Convert(cleanFullName.c_str(),
                                          cmLocalGenerator::START_OUTPUT,
                                          cmLocalGenerator::UNCHANGED));
--- 254,258 ----
    // may need to be cleaned.
    std::vector<std::string> exeCleanFiles;
!   exeCleanFiles.push_back(this->Convert(targetFullPath.c_str(),
                                          cmLocalGenerator::START_OUTPUT,
                                          cmLocalGenerator::UNCHANGED));
***************
*** 273,289 ****
    // There may be a manifest file for this target.  Add it to the
    // clean set just in case.
!   exeCleanFiles.push_back(this->Convert((cleanFullName+".manifest").c_str(),
                                          cmLocalGenerator::START_OUTPUT,
                                          cmLocalGenerator::UNCHANGED));
  #endif
!   if(cleanRealName != cleanName)
      {
!     exeCleanFiles.push_back(this->Convert(cleanFullRealName.c_str(),
                                            cmLocalGenerator::START_OUTPUT,
                                            cmLocalGenerator::UNCHANGED));
      }
!   if(!cleanImportName.empty())
      {
!     exeCleanFiles.push_back(this->Convert(cleanFullImportName.c_str(),
                                            cmLocalGenerator::START_OUTPUT,
                                            cmLocalGenerator::UNCHANGED));
--- 260,276 ----
    // There may be a manifest file for this target.  Add it to the
    // clean set just in case.
!   exeCleanFiles.push_back(this->Convert((targetFullPath+".manifest").c_str(),
                                          cmLocalGenerator::START_OUTPUT,
                                          cmLocalGenerator::UNCHANGED));
  #endif
!   if(targetNameReal != targetName)
      {
!     exeCleanFiles.push_back(this->Convert(targetFullPathReal.c_str(),
                                            cmLocalGenerator::START_OUTPUT,
                                            cmLocalGenerator::UNCHANGED));
      }
!   if(!targetNameImport.empty())
      {
!     exeCleanFiles.push_back(this->Convert(targetFullPathImport.c_str(),
                                            cmLocalGenerator::START_OUTPUT,
                                            cmLocalGenerator::UNCHANGED));
***************
*** 294,301 ****
    // linking the target.
    this->CleanFiles.push_back
!     (this->Convert(cleanFullPDBName.c_str(),
                     cmLocalGenerator::START_OUTPUT,
                     cmLocalGenerator::UNCHANGED));
-   }
  
    // Add the pre-build and pre-link rules building but not when relinking.
--- 281,287 ----
    // linking the target.
    this->CleanFiles.push_back
!     (this->Convert(targetFullPathPDB.c_str(),
                     cmLocalGenerator::START_OUTPUT,
                     cmLocalGenerator::UNCHANGED));
  
    // Add the pre-build and pre-link rules building but not when relinking.

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.242
retrieving revision 1.243
diff -C 2 -d -r1.242 -r1.243
*** cmTarget.cxx	1 May 2009 14:38:32 -0000	1.242
--- cmTarget.cxx	1 May 2009 14:39:17 -0000	1.243
***************
*** 2837,2852 ****
  
  //----------------------------------------------------------------------------
- void cmTarget::GetExecutableCleanNames(std::string& name,
-                                        std::string& realName,
-                                        std::string& impName,
-                                        std::string& pdbName,
-                                        const char* config)
- {
-   // Get the name and versioned name of this executable.
-   this->GetExecutableNamesInternal(name, realName, impName, pdbName,
-                                    cmTarget::EXECUTABLE, config);
- }
- 
- //----------------------------------------------------------------------------
  void cmTarget::GetExecutableNamesInternal(std::string& name,
                                            std::string& realName,
--- 2837,2840 ----