mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmState: Improve how state is reset

Browse Source 
Modify cmState::Reset to create a fresh BuildsystemDirectoryStateType
for the root, rather than trying to reset the old one. This is less
brittle with respect to changes made to BuildsystemDirectoryStateType
(e.g. adding new members).
This commit is contained in:
Matthew Woehlke
2025-04-02 15:18:00 -04:00
parent 1063a1c603
commit acaae6d265
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmState.cxx
View File

@@ -282,16 +282,12 @@ cmStateSnapshot cmState::Reset()
{
cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator it =
this->BuildsystemDirectory.Truncate();
it->IncludeDirectories.clear();
it->CompileDefinitions.clear();
it->CompileOptions.clear();
it->LinkOptions.clear();
it->LinkDirectories.clear();
it->CurrentScope = pos;
it->NormalTargetNames.clear();
it->ImportedTargetNames.clear();
it->Properties.Clear();
it->Children.clear();
cmStateDetail::BuildsystemDirectoryStateType newState;
newState.Location = std::move(it->Location);
newState.OutputLocation = std::move(it->OutputLocation);
newState.CurrentScope = pos;
*it = std::move(newState);
}
this->PolicyStack.Clear();