diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-10-07 18:13:36 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-10-07 18:13:36 (GMT) |
commit | d9b5f0a301c23c2c0e56ad3fcb696de71c3d6365 (patch) | |
tree | ae661ec00676dba7937b2b2b279036f3b27e50fd /Source/cmTarget.cxx | |
parent | 1c70c6cc09f0f8be087db2aeae5ee6a3f1b47bda (diff) | |
download | CMake-d9b5f0a301c23c2c0e56ad3fcb696de71c3d6365.zip CMake-d9b5f0a301c23c2c0e56ad3fcb696de71c3d6365.tar.gz CMake-d9b5f0a301c23c2c0e56ad3fcb696de71c3d6365.tar.bz2 |
cmTarget: Remove target name from parameter list
Use the member state instead.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 86a2777..651bcc8 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -578,8 +578,7 @@ void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const } } -void cmTarget::AddLinkLibrary(cmMakefile& mf, const std::string& target, - const std::string& lib, +void cmTarget::AddLinkLibrary(cmMakefile& mf, const std::string& lib, cmTargetLinkLibraryType llt) { cmTarget* tgt = this->Makefile->FindTargetToUse(lib); @@ -597,7 +596,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, const std::string& target, if (cmGeneratorExpression::Find(lib) != std::string::npos || (tgt && tgt->GetType() == cmState::INTERFACE_LIBRARY) || - (target == lib)) { + (this->Name == lib)) { return; } @@ -615,7 +614,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, const std::string& target, // and we removing one instance will break the link line. Duplicates // will be appropriately eliminated at emit time. if (this->RecordDependencies) { - std::string targetEntry = target; + std::string targetEntry = this->Name; targetEntry += "_LIB_DEPENDS"; std::string dependencies; const char* old_val = mf.GetDefinition(targetEntry); |