From 80cb12bb8bc14eb3e56f344d03254777351e5c74 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 14 Jul 2014 14:19:32 -0400 Subject: 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. --- Source/cmExportLibraryDependenciesCommand.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx index 688d2eb..cb150a7 100644 --- a/Source/cmExportLibraryDependenciesCommand.cxx +++ b/Source/cmExportLibraryDependenciesCommand.cxx @@ -108,14 +108,12 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const std::string targetEntry = target.GetName(); targetEntry += "_LIB_DEPENDS"; - // Construct the dependency variable value. It is safe to use - // the target GetLinkLibraries method here because this code is - // 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. + // Construct the dependency variable value with the direct link + // dependencies. std::string valueOld; std::string valueNew; - cmTarget::LinkLibraryVectorType const& libs = target.GetLinkLibraries(); + cmTarget::LinkLibraryVectorType const& libs = + target.GetOriginalLinkLibraries(); for(cmTarget::LinkLibraryVectorType::const_iterator li = libs.begin(); li != libs.end(); ++li) { -- cgit v0.12