kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename local target lookup methods to clarify purpose 

Rename methods:

* `cmMakefile::Find{ => LocalNonAlias}Target`
* `cmLocalGenerator::Find{ => LocalNonAlias}GeneratorTarget`

These names clarify that they are for directory-local target names
and do not consider alias targets.
This commit is contained in:
Brad King 2016-04-01 10:26:08 -04:00
parent bc30f8b5e6
commit 0e44f4894f
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFLTKWrapUICommand.cxx
View File

@ -117,7 +117,7 @@ void cmFLTKWrapUICommand::FinalPass()
// people should add the srcs to the target themselves, but the old command // people should add the srcs to the target themselves, but the old command
// didn't support that, so check and see if they added the files in and if // didn't support that, so check and see if they added the files in and if
// they didn;t then print a warning and add then anyhow // they didn;t then print a warning and add then anyhow
cmTarget* target = this->Makefile->FindTarget(this->Target); cmTarget* target = this->Makefile->FindLocalNonAliasTarget(this->Target);
if(!target) if(!target)
{ {
std::string msg = std::string msg =

2
Source/cmInstallCommand.cxx
View File

@ -381,7 +381,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
return false; return false;
} }
// Lookup this target in the current directory. // Lookup this target in the current directory.
if(cmTarget* target=this->Makefile->FindTarget(*targetIt)) if(cmTarget* target=this->Makefile->FindLocalNonAliasTarget(*targetIt))
{ {
// Found the target. Check its type. // Found the target. Check its type.
if(target->GetType() != cmState::EXECUTABLE && if(target->GetType() != cmState::EXECUTABLE &&

2
Source/cmInstallTargetGenerator.cxx
View File

@ -446,7 +446,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg) void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg)
{ {
this->Target = lg->FindGeneratorTarget(this->TargetName); this->Target = lg->FindLocalNonAliasGeneratorTarget(this->TargetName);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

4
Source/cmLocalGenerator.cxx
View File

@ -485,7 +485,7 @@ private:
std::string Name; std::string Name;
}; };
cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget( cmGeneratorTarget* cmLocalGenerator::FindLocalNonAliasGeneratorTarget(
const std::string& name) const const std::string& name) const
{ {
std::vector<cmGeneratorTarget*>::const_iterator ti = std::vector<cmGeneratorTarget*>::const_iterator ti =
@ -1828,7 +1828,7 @@ cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
return *imported; return *imported;
} }
if(cmGeneratorTarget* t = this->FindGeneratorTarget(name)) if(cmGeneratorTarget* t = this->FindLocalNonAliasGeneratorTarget(name))
{ {
return t; return t;
} }

3
Source/cmLocalGenerator.h
View File

@ -129,7 +129,8 @@ public:
void AddImportedGeneratorTarget(cmGeneratorTarget* gt); void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt); void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const; cmGeneratorTarget*
FindLocalNonAliasGeneratorTarget(const std::string& name) const;
cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const; cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
/** /**

4
Source/cmMakefile.cxx
View File

@ -4058,7 +4058,7 @@ std::vector<std::string> cmMakefile::GetPropertyKeys() const
return this->StateSnapshot.GetDirectory().GetPropertyKeys(); return this->StateSnapshot.GetDirectory().GetPropertyKeys();
} }
cmTarget* cmMakefile::FindTarget(const std::string& name) const cmTarget* cmMakefile::FindLocalNonAliasTarget(const std::string& name) const
{ {
cmTargets::iterator i = this->Targets.find( name ); cmTargets::iterator i = this->Targets.find( name );
if ( i != this->Targets.end() ) if ( i != this->Targets.end() )
@ -4235,7 +4235,7 @@ cmTarget* cmMakefile::FindTargetToUse(const std::string& name,
} }
// Look for a target built in this directory. // Look for a target built in this directory.
if(cmTarget* t = this->FindTarget(name)) if(cmTarget* t = this->FindLocalNonAliasTarget(name))
{ {
return t; return t;
} }

2
Source/cmMakefile.h
View File

@ -388,7 +388,7 @@ public:
} }
std::vector<cmTarget*> GetImportedTargets() const; std::vector<cmTarget*> GetImportedTargets() const;
cmTarget* FindTarget(const std::string& name) const; cmTarget* FindLocalNonAliasTarget(const std::string& name) const;
/** Find a target to use in place of the given name. The target /** Find a target to use in place of the given name. The target
returned may be imported or built within the project. */ returned may be imported or built within the project. */