kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmState: Rename CreateSnapshot method. 

Leave the namespace open for other snapshot types.
This commit is contained in:
Stephen Kelly 2015-05-23 08:00:46 +02:00
parent da28f11523
commit 942df88bf8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefile.cxx
View File

@ -1619,7 +1619,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
} }
cmState::Snapshot newSnapshot = this->GetState() cmState::Snapshot newSnapshot = this->GetState()
->CreateSnapshot(this->StateSnapshot); ->CreateBuildsystemDirectorySnapshot(this->StateSnapshot);
// create a new local generator and set its parent // create a new local generator and set its parent
cmLocalGenerator *lg2 = this->GetGlobalGenerator() cmLocalGenerator *lg2 = this->GetGlobalGenerator()

3
Source/cmState.cxx
View File

@ -672,7 +672,8 @@ cmState::Snapshot cmState::CreateBaseSnapshot()
return cmState::Snapshot(this, pos); return cmState::Snapshot(this, pos);
} }
cmState::Snapshot cmState::CreateSnapshot(Snapshot originSnapshot) cmState::Snapshot
cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot)
{ {
assert(originSnapshot.IsValid()); assert(originSnapshot.IsValid());
PositionType pos = this->ParentPositions.size(); PositionType pos = this->ParentPositions.size();

2
Source/cmState.h
View File

@ -58,7 +58,7 @@ public:
}; };
Snapshot CreateBaseSnapshot(); Snapshot CreateBaseSnapshot();
Snapshot CreateSnapshot(Snapshot originSnapshot); Snapshot CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot);
enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC, enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC,
UNINITIALIZED }; UNINITIALIZED };