diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 848ffa537..2627afde5 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -889,7 +889,7 @@ cmGlobalUnixMakefileGenerator3 if(emitted.insert(lib->first).second) { // Add this dependency. - this->AppendAnyGlobalDepend(depends, lib->first.c_str()); + this->AppendAnyGlobalDepend(depends, lib->first.c_str(), emitted); } } } @@ -903,7 +903,7 @@ cmGlobalUnixMakefileGenerator3 if(emitted.insert(*util).second) { // Add this dependency. - this->AppendAnyGlobalDepend(depends, util->c_str()); + this->AppendAnyGlobalDepend(depends, util->c_str(), emitted); } } } @@ -912,7 +912,8 @@ cmGlobalUnixMakefileGenerator3 //---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 -::AppendAnyGlobalDepend(std::vector& depends, const char* name) +::AppendAnyGlobalDepend(std::vector& depends, const char* name, + std::set& emitted) { cmTarget *result; @@ -930,6 +931,21 @@ cmGlobalUnixMakefileGenerator3 std::string tgtName = lg3->GetRelativeTargetDirectory(*result); tgtName += "/all"; depends.push_back(tgtName); + if(result->GetType() == cmTarget::STATIC_LIBRARY) + { + const cmTarget::LinkLibraries& tlibs = result->GetLinkLibraries(); + for(cmTarget::LinkLibraries::const_iterator lib = tlibs.begin(); + lib != tlibs.end(); ++lib) + { + // Don't emit the same library twice for this target. + if(emitted.insert(lib->first).second) + { + // Add this dependency. + this->AppendAnyGlobalDepend(depends, lib->first.c_str(), + emitted); + } + } + } return; } } diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 6fc4f5f6f..a17c389fb 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -108,7 +108,7 @@ protected: void AppendGlobalTargetDepends(std::vector& depends, cmTarget& target); void AppendAnyGlobalDepend(std::vector& depends, - const char* name); + const char* name, std::set& emitted); // does this generator need a requires step for any of its targets bool NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg);