diff options
| author | Ken Martin <ken.martin@kitware.com> | 2006-06-19 15:34:50 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2006-06-19 15:34:50 (GMT) |
| commit | a6bf59baefe94ce04ba3e67d3e3ae415fc58533a (patch) | |
| tree | f546dc33df4f751048895accdbec79b599820422 | |
| parent | 6207dc41bd3cc396e82848002db784b2acb7a77d (diff) | |
| download | CMake-a6bf59baefe94ce04ba3e67d3e3ae415fc58533a.zip CMake-a6bf59baefe94ce04ba3e67d3e3ae415fc58533a.tar.gz CMake-a6bf59baefe94ce04ba3e67d3e3ae415fc58533a.tar.bz2 | |
ENH: fix for dependent targets
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 12 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.h | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index ebac588..cf7d748 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -867,7 +867,8 @@ cmGlobalUnixMakefileGenerator3 progCmd << lg->Convert(progressDir.c_str(), cmLocalGenerator::FULL, cmLocalGenerator::SHELL); - progCmd << " " << lg->ProgressFiles[t->first].size(); + // + progCmd << " " << this->GetTargetTotalNumberOfProgressFiles(t->second); commands.push_back(progCmd.str()); } std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash(); @@ -938,15 +939,18 @@ cmGlobalUnixMakefileGenerator3 //---------------------------------------------------------------------------- int cmGlobalUnixMakefileGenerator3 -::GetTargetTotalNumberOfSourceFiles(cmTarget& target) +::GetTargetTotalNumberOfProgressFiles(cmTarget& target) { - int result = this->GetNumberOfCompilableSourceFilesForTarget(target); + cmLocalUnixMakefileGenerator3 *lg = + static_cast<cmLocalUnixMakefileGenerator3 *> + (target.GetMakefile()->GetLocalGenerator()); + int result = lg->ProgressFiles[target.GetName()].size(); std::vector<cmTarget *>& depends = this->GetTargetDepends(target); std::vector<cmTarget *>::iterator i; for (i = depends.begin(); i != depends.end(); ++i) { - result += this->GetTargetTotalNumberOfSourceFiles(**i); + result += this->GetTargetTotalNumberOfProgressFiles(**i); } return result; diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index ad1e3b9..47557b9 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -126,7 +126,7 @@ public: // returns true if a progress rule should be added int ShouldAddProgressRule(); int GetNumberOfCompilableSourceFilesForTarget(cmTarget &tgt); - int GetTargetTotalNumberOfSourceFiles(cmTarget& target); + int GetTargetTotalNumberOfProgressFiles(cmTarget& target); int GetNumberOfSourceFiles() { return this->NumberOfSourceFiles; }; // what targets does the specified target depend on |