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

cmState: Truncate snapshot data in Initialize.

Browse Source 
When Configure is executed multiple times with the same cmake
instance (either using CTest --two-config or a interactive gui), the
location and structural data was preserved though it would not be used
again.  Fix that by clearing the data in a method called early in
the configure step.
This commit is contained in:
Stephen Kelly 2015-05-03 20:36:26 +02:00
parent 6cd6d50871
commit 83dc483e4e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmState.cxx
View File

@ -22,7 +22,6 @@ cmState::cmState(cmake* cm)
: CMakeInstance(cm), : CMakeInstance(cm),
IsInTryCompile(false) IsInTryCompile(false)
{ {
this->CreateSnapshot(Snapshot());
this->Initialize(); this->Initialize();
} }
@ -194,8 +193,12 @@ void cmState::RemoveCacheEntryProperty(std::string const& key,
void cmState::Initialize() void cmState::Initialize()
{ {
this->GlobalProperties.clear(); this->GlobalProperties.clear();
this->PropertyDefinitions.clear(); this->PropertyDefinitions.clear();
this->Locations.clear();
this->OutputLocations.clear();
this->ParentPositions.clear();
this->CreateSnapshot(Snapshot());
this->DefineProperty this->DefineProperty
("RULE_LAUNCH_COMPILE", cmProperty::DIRECTORY, ("RULE_LAUNCH_COMPILE", cmProperty::DIRECTORY,
"", "", true); "", "", true);