diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-18 21:28:48 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-19 15:40:59 +0200 |
| commit | cde6eb6249cd3211cb3391860221ec32f985e53b (patch) | |
| tree | 7e00e7e59cdcfe57ad9a2b610159129998918afc /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | a9bf981a4c0ee3aece0b162ba7ebc76ad99330eb (diff) | |
| download | cmake-cde6eb6249cd3211cb3391860221ec32f985e53b.tar.gz | |
cmState: Port dependent code to new cmStateSnapshot name
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 45f8151b19..3433d756ce 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -436,9 +436,8 @@ void cmGlobalUnixMakefileGenerator3::WriteDirectoryRule2( // The directory-level rule should depend on the directory-level // rules of the subdirectories. - std::vector<cmState::Snapshot> children = - lg->GetStateSnapshot().GetChildren(); - for (std::vector<cmState::Snapshot>::const_iterator ci = children.begin(); + std::vector<cmStateSnapshot> children = lg->GetStateSnapshot().GetChildren(); + for (std::vector<cmStateSnapshot>::const_iterator ci = children.begin(); ci != children.end(); ++ci) { std::string subdir = ci->GetDirectory().GetCurrentBinary(); subdir += "/"; @@ -507,7 +506,7 @@ void cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( if (!this->Makefiles.empty()) { mf = this->Makefiles[0]; } else { - cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot(); + cmStateSnapshot snapshot = this->CMakeInstance->GetCurrentSnapshot(); snapshot.GetDirectory().SetCurrentSource( this->CMakeInstance->GetHomeDirectory()); snapshot.GetDirectory().SetCurrentBinary( @@ -817,8 +816,8 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() continue; } - cmState::Snapshot csnp = lg->GetStateSnapshot(); - cmState::Snapshot tsnp = tlg->GetStateSnapshot(); + cmStateSnapshot csnp = lg->GetStateSnapshot(); + cmStateSnapshot tsnp = tlg->GetStateSnapshot(); // Consider the directory containing the target and all its // parents until something excludes the target. |