diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-21 17:51:50 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-24 07:19:53 (GMT) |
| commit | f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5 (patch) | |
| tree | 60cb17dfb4aa34837b7009233630bbe978506b8f /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be (diff) | |
| download | CMake-f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5.zip CMake-f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5.tar.gz CMake-f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5.tar.bz2 | |
Makefiles: Port progress marks to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 74d23a3..248701a 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -778,7 +778,7 @@ cmGlobalUnixMakefileGenerator3 std::ostringstream progressArg; const char* sep = ""; std::vector<unsigned long>& progFiles = - this->ProgressMap[gtarget->Target].Marks; + this->ProgressMap[gtarget].Marks; for (std::vector<unsigned long>::iterator i = progFiles.begin(); i != progFiles.end(); ++i) { @@ -966,7 +966,7 @@ cmGlobalUnixMakefileGenerator3 size_t count = 0; if(emitted.insert(target).second) { - count = this->ProgressMap[target->Target].Marks.size(); + count = this->ProgressMap[target].Marks.size(); TargetDependSet const& depends = this->GetTargetDirectDepends(target); for(TargetDependSet::const_iterator di = depends.begin(); di != depends.end(); ++di) @@ -1003,7 +1003,7 @@ void cmGlobalUnixMakefileGenerator3::RecordTargetProgress( cmMakefileTargetGenerator* tg) { - TargetProgress& tp = this->ProgressMap[tg->GetTarget()]; + TargetProgress& tp = this->ProgressMap[tg->GetGeneratorTarget()]; tp.NumberOfActions = tg->GetNumberOfProgressActions(); tp.VariableFile = tg->GetProgressFileNameFull(); } |