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

export_library_dependencies: Use original link libraries internally 

This command was using the cmTarget::GetLinkLibraries method with a
comment explaining how execution order gives it the dependencies before
analysis.  Just use cmTarget::GetOriginalLinkLibraries instead.
This commit is contained in:
Brad King 2014-07-14 14:19:32 -04:00
parent c72642f927
commit 80cb12bb8b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmExportLibraryDependenciesCommand.cxx
View File

@ -108,14 +108,12 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
std::string targetEntry = target.GetName(); std::string targetEntry = target.GetName();
targetEntry += "_LIB_DEPENDS"; targetEntry += "_LIB_DEPENDS";
// Construct the dependency variable value. It is safe to use // Construct the dependency variable value with the direct link
// the target GetLinkLibraries method here because this code is // dependencies.
// called at the end of configure but before generate so library
// dependencies have yet to be analyzed. Therefore the value
// will be the direct link dependencies.
std::string valueOld; std::string valueOld;
std::string valueNew; std::string valueNew;
cmTarget::LinkLibraryVectorType const& libs = target.GetLinkLibraries(); cmTarget::LinkLibraryVectorType const& libs =
target.GetOriginalLinkLibraries();
for(cmTarget::LinkLibraryVectorType::const_iterator li = libs.begin(); for(cmTarget::LinkLibraryVectorType::const_iterator li = libs.begin();
li != libs.end(); ++li) li != libs.end(); ++li)
{ {