summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-04 15:02:25 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-05-04 15:02:25 (GMT)
commitd3b36a90b661543f937daffafdf386c91a9592f5 (patch)
tree98a96afb4e5dcfa690f2cc52a0f932d5ce506a69 /Source
parent0d167b3e609bf7addc51567f92c9cf5b0b898381 (diff)
parent83dc483e4e35b528a5ece7a336399a994bd3f67e (diff)
downloadCMake-d3b36a90b661543f937daffafdf386c91a9592f5.zip
CMake-d3b36a90b661543f937daffafdf386c91a9592f5.tar.gz
CMake-d3b36a90b661543f937daffafdf386c91a9592f5.tar.bz2
Merge topic 'truncate-snapshots'
83dc483e cmState: Truncate snapshot data in Initialize.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmState.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 24cbc4a..67a2274 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -22,7 +22,6 @@ cmState::cmState(cmake* cm)
: CMakeInstance(cm),
IsInTryCompile(false)
{
- this->CreateSnapshot(Snapshot());
this->Initialize();
}
@@ -194,8 +193,12 @@ void cmState::RemoveCacheEntryProperty(std::string const& key,
void cmState::Initialize()
{
this->GlobalProperties.clear();
-
this->PropertyDefinitions.clear();
+ this->Locations.clear();
+ this->OutputLocations.clear();
+ this->ParentPositions.clear();
+
+ this->CreateSnapshot(Snapshot());
this->DefineProperty
("RULE_LAUNCH_COMPILE", cmProperty::DIRECTORY,
"", "", true);