[cmake-commits] king committed cmComputeLinkDepends.cxx 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jan 30 12:15:19 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6967/Source
Modified Files:
cmComputeLinkDepends.cxx
Log Message:
BUG: cmComputeLinkDepends should not follow the dependencies of executables.
Index: cmComputeLinkDepends.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkDepends.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmComputeLinkDepends.cxx 28 Jan 2008 13:38:35 -0000 1.3
+++ cmComputeLinkDepends.cxx 30 Jan 2008 17:15:17 -0000 1.4
@@ -263,14 +263,17 @@
if(entry.Target)
{
// Follow the target dependencies.
- if(entry.Target->IsImported())
- {
- this->AddImportedLinkEntries(depender_index, entry.Target);
- }
- else
+ if(entry.Target->GetType() != cmTarget::EXECUTABLE)
{
- this->AddTargetLinkEntries(depender_index,
- entry.Target->GetOriginalLinkLibraries());
+ if(entry.Target->IsImported())
+ {
+ this->AddImportedLinkEntries(depender_index, entry.Target);
+ }
+ else
+ {
+ this->AddTargetLinkEntries(depender_index,
+ entry.Target->GetOriginalLinkLibraries());
+ }
}
}
else
More information about the Cmake-commits
mailing list