mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmTarget: Simplify ClearDependencyInformation signature

Browse Source 
We don't need to pass an argument with the target's own name.
This commit is contained in:
Brad King
2018-03-06 13:54:45 -05:00
parent 674c5b3066
commit 910a9d608e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefile.cxx
View File

@@ -1867,7 +1867,7 @@ cmTarget* cmMakefile::AddLibrary(const std::string& lname,
// Clear its dependencies. Otherwise, dependencies might persist
// over changes in CMakeLists.txt, making the information stale and
// hence useless.
target->ClearDependencyInformation(*this, lname);
target->ClearDependencyInformation(*this);
if (excludeFromAll) {
target->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
}

7
Source/cmTarget.cxx
View File

@@ -635,12 +635,11 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
return this->LinkDirectories;
}
void cmTarget::ClearDependencyInformation(cmMakefile& mf,
const std::string& target)
void cmTarget::ClearDependencyInformation(cmMakefile& mf)
{
// Clear the dependencies. The cache variable must exist iff we are
// recording dependency information for this target.
std::string depname = target;
std::string depname = this->GetName();
depname += "_LIB_DEPENDS";
if (this->RecordDependencies) {
mf.AddCacheDefinition(depname, "", "Dependencies for target",
@@ -648,7 +647,7 @@ void cmTarget::ClearDependencyInformation(cmMakefile& mf,
} else {
if (mf.GetDefinition(depname)) {
std::string message = "Target ";
message += target;
message += this->GetName();
message += " has dependency information when it shouldn't.\n";
message += "Your cache is probably stale. Please remove the entry\n ";
message += depname;

2
Source/cmTarget.h
View File

@@ -137,7 +137,7 @@ public:
/**
* Clear the dependency information recorded for this target, if any.
*/
void ClearDependencyInformation(cmMakefile& mf, const std::string& target);
void ClearDependencyInformation(cmMakefile& mf);
void AddLinkLibrary(cmMakefile& mf, const std::string& lib,
cmTargetLinkLibraryType llt);