summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-13 23:08:34 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-21 18:19:53 (GMT)
commit217c243db04a21763848ac048edf153cd93bd883 (patch)
tree7b848de03d8347ff288124e138c3fadff0952b6d /Source/cmake.cxx
parenteb05dcd6c9b587eeb8738d9f08459d94733708f6 (diff)
downloadCMake-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/cmake.cxx')
-rw-r--r--Source/cmake.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index eeb6575..e51b260 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -186,7 +186,7 @@ cmake::~cmake()
void cmake::CleanupCommandsAndMacros()
{
- this->State->Reset();
+ this->CurrentSnapshot = this->State->Reset();
this->State->RemoveUserDefinedCommands();
}
@@ -370,6 +370,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
// read in the list file to fill the cache
if(path)
{
+ this->CurrentSnapshot = this->State->Reset();
std::string homeDir = this->GetHomeDirectory();
std::string homeOutputDir = this->GetHomeOutputDirectory();
this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());