Merge topic 'fix-state-reset'

acaae6d265 cmState: Improve how state is reset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10583
This commit is contained in:
Brad King
2025-04-03 18:03:23 +00:00
committed by Kitware Robot
+6 -10
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();