diff options
author | Brad King <brad.king@kitware.com> | 2009-05-01 14:39:28 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-05-01 14:39:28 (GMT) |
commit | bcb9a479db38b5775cb84c1265b3a18736a3dfc1 (patch) | |
tree | 5067574115a8e0ba0955f5dd4e32315de6e064c6 /Source/cmMakefileExecutableTargetGenerator.cxx | |
parent | 430cc2b4b7a817be2fbc445d6803163f1695a533 (diff) | |
download | CMake-bcb9a479db38b5775cb84c1265b3a18736a3dfc1.zip CMake-bcb9a479db38b5775cb84c1265b3a18736a3dfc1.tar.gz CMake-bcb9a479db38b5775cb84c1265b3a18736a3dfc1.tar.bz2 |
ENH: Remove cmTarget::GetExecutableCleanNames
This method was redundant with GetExecutableNames.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index acffb8a..332c116 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -253,38 +253,25 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Construct a list of files associated with this executable that // 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(), + exeCleanFiles.push_back(this->Convert(targetFullPath.c_str(), cmLocalGenerator::START_OUTPUT, cmLocalGenerator::UNCHANGED)); #ifdef _WIN32 // 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(), + exeCleanFiles.push_back(this->Convert((targetFullPath+".manifest").c_str(), cmLocalGenerator::START_OUTPUT, cmLocalGenerator::UNCHANGED)); #endif - if(cleanRealName != cleanName) + if(targetNameReal != targetName) { - exeCleanFiles.push_back(this->Convert(cleanFullRealName.c_str(), + exeCleanFiles.push_back(this->Convert(targetFullPathReal.c_str(), cmLocalGenerator::START_OUTPUT, cmLocalGenerator::UNCHANGED)); } - if(!cleanImportName.empty()) + if(!targetNameImport.empty()) { - exeCleanFiles.push_back(this->Convert(cleanFullImportName.c_str(), + exeCleanFiles.push_back(this->Convert(targetFullPathImport.c_str(), cmLocalGenerator::START_OUTPUT, cmLocalGenerator::UNCHANGED)); } @@ -293,10 +280,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // cleaned. We do not want to delete the .pdb file just before // linking the target. this->CleanFiles.push_back - (this->Convert(cleanFullPDBName.c_str(), + (this->Convert(targetFullPathPDB.c_str(), cmLocalGenerator::START_OUTPUT, cmLocalGenerator::UNCHANGED)); - } // Add the pre-build and pre-link rules building but not when relinking. if(!relink) |