diff options
| author | Brad King <brad.king@kitware.com> | 2001-06-12 14:59:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-06-12 14:59:40 (GMT) |
| commit | 5f12ae0c62634f641496b4ed1b56ac8aed030807 (patch) | |
| tree | 2b6a008ceaa795b2755d6f72816f49e9d4f33215 | |
| parent | 46aa1cb9c4e85564435ae78ff1b0c239301a717a (diff) | |
| download | CMake-5f12ae0c62634f641496b4ed1b56ac8aed030807.zip CMake-5f12ae0c62634f641496b4ed1b56ac8aed030807.tar.gz CMake-5f12ae0c62634f641496b4ed1b56ac8aed030807.tar.bz2 | |
BUG: Dependency hints must be removed by the makefile generator before adding the dependencies generated by cmMakeDepend.
| -rw-r--r-- | Source/cmMakeDepend.cxx | 14 | ||||
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx index 0102476..fe26219 100644 --- a/Source/cmMakeDepend.cxx +++ b/Source/cmMakeDepend.cxx @@ -169,15 +169,6 @@ void cmMakeDepend::Depend(cmDependInformation* info) // If the file exists, use it to find dependency information. 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. this->DependWalk(info, path); info->m_DependDone = true; @@ -203,11 +194,6 @@ void cmMakeDepend::Depend(cmDependInformation* info) 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. return; } diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 939eef9..d57bbb0 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -93,6 +93,11 @@ void cmUnixMakefileGenerator::ProcessDepends(const cmMakeDepend &md) // get the depends const cmDependInformation *info = 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) { for( cmDependInformation::IndexSet::const_iterator indx = |