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

COMP: Removed unused paramter from cmLocalGenerator::OutputLinkLibraries.

This commit is contained in:
Brad King 2006-01-13 18:33:51 -05:00
parent 22c62c9e65
commit 327489ae59
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmLocalGenerator.cxx
View File

@ -1223,7 +1223,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
linkFlags += " "; linkFlags += " ";
} }
cmOStringStream linklibsStr; cmOStringStream linklibsStr;
this->OutputLinkLibraries(linklibsStr, target.GetName(), target); this->OutputLinkLibraries(linklibsStr, target);
linkLibs = linklibsStr.str(); linkLibs = linklibsStr.str();
} }
break; break;
@ -1256,7 +1256,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
flags += m_Makefile->GetSafeDefinition(sharedFlagsVar.c_str()); flags += m_Makefile->GetSafeDefinition(sharedFlagsVar.c_str());
flags += " "; flags += " ";
cmOStringStream linklibs; cmOStringStream linklibs;
this->OutputLinkLibraries(linklibs, 0, target); this->OutputLinkLibraries(linklibs, target);
linkLibs = linklibs.str(); linkLibs = linklibs.str();
if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS"))) if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS")))
{ {
@ -1296,7 +1296,6 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
* to the name of the library. This will not link a library against itself. * to the name of the library. This will not link a library against itself.
*/ */
void cmLocalGenerator::OutputLinkLibraries(std::ostream& fout, void cmLocalGenerator::OutputLinkLibraries(std::ostream& fout,
const char* targetLibrary,
cmTarget &tgt) cmTarget &tgt)
{ {
// Try to emit each search path once // Try to emit each search path once

2
Source/cmLocalGenerator.h
View File

@ -174,7 +174,7 @@ protected:
cmTarget&target); cmTarget&target);
///! put all the libraries for a target on into the given stream ///! put all the libraries for a target on into the given stream
virtual void OutputLinkLibraries(std::ostream&, const char* name,cmTarget &); virtual void OutputLinkLibraries(std::ostream&, cmTarget&);
/** Compute the string to use to refer to a target in an install /** Compute the string to use to refer to a target in an install
file. */ file. */

4
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1523,7 +1523,7 @@ cmLocalUnixMakefileGenerator3
// Collect up flags to link in needed libraries. // Collect up flags to link in needed libraries.
cmOStringStream linklibs; cmOStringStream linklibs;
this->OutputLinkLibraries(linklibs, 0, target); this->OutputLinkLibraries(linklibs, target);
// Construct object file lists that may be needed to expand the // Construct object file lists that may be needed to expand the
// rule. // rule.
@ -1868,7 +1868,7 @@ cmLocalUnixMakefileGenerator3
// Collect up flags to link in needed libraries. // Collect up flags to link in needed libraries.
cmOStringStream linklibs; cmOStringStream linklibs;
this->OutputLinkLibraries(linklibs, target.GetName(), target); this->OutputLinkLibraries(linklibs, target);
// Construct object file lists that may be needed to expand the // Construct object file lists that may be needed to expand the
// rule. // rule.