summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-06-19 15:34:50 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-06-19 15:34:50 (GMT)
commita6bf59baefe94ce04ba3e67d3e3ae415fc58533a (patch)
treef546dc33df4f751048895accdbec79b599820422 /Source/cmGlobalUnixMakefileGenerator3.cxx
parent6207dc41bd3cc396e82848002db784b2acb7a77d (diff)
downloadCMake-a6bf59baefe94ce04ba3e67d3e3ae415fc58533a.zip
CMake-a6bf59baefe94ce04ba3e67d3e3ae415fc58533a.tar.gz
CMake-a6bf59baefe94ce04ba3e67d3e3ae415fc58533a.tar.bz2
ENH: fix for dependent targets
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx12
1 files changed, 8 insertions, 4 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;