summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-18 19:28:48 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-19 13:40:59 (GMT)
commitcde6eb6249cd3211cb3391860221ec32f985e53b (patch)
tree7e00e7e59cdcfe57ad9a2b610159129998918afc /Source/cmGlobalNinjaGenerator.cxx
parenta9bf981a4c0ee3aece0b162ba7ebc76ad99330eb (diff)
downloadCMake-cde6eb6249cd3211cb3391860221ec32f985e53b.zip
CMake-cde6eb6249cd3211cb3391860221ec32f985e53b.tar.gz
CMake-cde6eb6249cd3211cb3391860221ec32f985e53b.tar.bz2
cmState: Port dependent code to new cmStateSnapshot name
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a84baca..7015669 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1116,9 +1116,9 @@ void cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
// The directory-level rule should depend on the directory-level
// rules of the subdirectories.
- std::vector<cmState::Snapshot> const& children =
+ std::vector<cmStateSnapshot> const& children =
lg->GetStateSnapshot().GetChildren();
- for (std::vector<cmState::Snapshot>::const_iterator stateIt =
+ for (std::vector<cmStateSnapshot>::const_iterator stateIt =
children.begin();
stateIt != children.end(); ++stateIt) {
targetsPerFolder[currentSourceFolder].push_back(
@@ -1667,8 +1667,7 @@ bool cmGlobalNinjaGenerator::WriteDyndepFile(
{
// Setup path conversions.
{
- cmState::Snapshot snapshot =
- this->GetCMakeInstance()->GetCurrentSnapshot();
+ cmStateSnapshot snapshot = this->GetCMakeInstance()->GetCurrentSnapshot();
snapshot.GetDirectory().SetCurrentSource(dir_cur_src);
snapshot.GetDirectory().SetCurrentBinary(dir_cur_bld);
snapshot.GetDirectory().SetRelativePathTopSource(dir_top_src.c_str());