diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-13 23:08:34 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:19:53 (GMT) |
| commit | 217c243db04a21763848ac048edf153cd93bd883 (patch) | |
| tree | 7b848de03d8347ff288124e138c3fadff0952b6d /Source/cmState.cxx | |
| parent | eb05dcd6c9b587eeb8738d9f08459d94733708f6 (diff) | |
| download | CMake-217c243db04a21763848ac048edf153cd93bd883.zip CMake-217c243db04a21763848ac048edf153cd93bd883.tar.gz CMake-217c243db04a21763848ac048edf153cd93bd883.tar.bz2 | |
cmake: Update the current snapshot when Resetting.
This will matter when definitions are stored in the cmState.
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index f0c7e6d..58500cc 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -219,13 +219,13 @@ void cmState::RemoveCacheEntryProperty(std::string const& key, ->GetCacheIterator(key.c_str()).SetProperty(propertyName, (void*)0); } -void cmState::Reset() +cmState::Snapshot cmState::Reset() { this->GlobalProperties.clear(); this->PropertyDefinitions.clear(); this->BuildsystemDirectory.Truncate(); - this->SnapshotData.Truncate(); + PositionType pos = this->SnapshotData.Truncate(); this->DefineProperty ("RULE_LAUNCH_COMPILE", cmProperty::DIRECTORY, @@ -246,6 +246,8 @@ void cmState::Reset() this->DefineProperty ("RULE_LAUNCH_CUSTOM", cmProperty::TARGET, "", "", true); + + return Snapshot(this, pos); } void cmState::DefineProperty(const std::string& name, |