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

BUG: Dependency hints must be removed by the makefile generator before adding the dependencies generated by cmMakeDepend.

Browse Source
This commit is contained in:
Brad King 2001-06-12 10:59:40 -04:00
parent 46aa1cb9c4
commit 5f12ae0c62
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmMakeDepend.cxx
View File

@ -169,15 +169,6 @@ void cmMakeDepend::Depend(cmDependInformation* info)
// If the file exists, use it to find dependency information. // If the file exists, use it to find dependency information.
if(cmSystemTools::FileExists(path)) if(cmSystemTools::FileExists(path))
{ {
// The cmSourceFile may have had hints for dependencies. Delete any that
// exist since we can find the dependencies for real.
if(info->m_ClassFileIndex != 0)
{
const cmSourceFile& cFile = *(info->m_ClassFileIndex);
//cFile.GetDepends().erase(cFile.GetDepends().begin(),
// cFile.GetDepends().end());
}
// Use the real file to find its dependencies. // Use the real file to find its dependencies.
this->DependWalk(info, path); this->DependWalk(info, path);
info->m_DependDone = true; info->m_DependDone = true;
@ -203,11 +194,6 @@ void cmMakeDepend::Depend(cmDependInformation* info)
this->AddDependency(info, file->c_str()); this->AddDependency(info, file->c_str());
} }
// Erase the dependency hints from the cmSourceFile. They will be
// put in again as real dependencies later.
//cFile.GetDepends().erase(cFile.GetDepends().begin(),
// cFile.GetDepends().end());
// Found dependency information. We are done. // Found dependency information. We are done.
return; return;
} }

5
Source/cmUnixMakefileGenerator.cxx
View File

@ -93,6 +93,11 @@ void cmUnixMakefileGenerator::ProcessDepends(const cmMakeDepend &md)
// get the depends // get the depends
const cmDependInformation *info = const cmDependInformation *info =
md.GetDependInformationForSourceFile(*i); md.GetDependInformationForSourceFile(*i);
// Delete any hints from the source file's dependencies.
i->GetDepends().erase(i->GetDepends().begin(), i->GetDepends().end());
// Now add the real dependencies for the file.
if (info) if (info)
{ {
for( cmDependInformation::IndexSet::const_iterator indx = for( cmDependInformation::IndexSet::const_iterator indx =