Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 21:40:15 +08:00
Code Issues Projects Releases Wiki Activity

cmState: Clear GlobVerificationManager state on Reset

Browse Source 
It should not persist across multiple configure rounds.

Fixes: #18208
This commit is contained in:
Shane Parris
2018-08-09 12:51:29 -04:00
committed by Brad King
parent c4ab098097
commit 6f3b9e8b95
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGlobVerificationManager.cxx
View File

@@ -170,3 +170,10 @@ void cmGlobVerificationManager::AddCacheEntry(
value.Backtraces.emplace_back(variable, backtrace); value.Backtraces.emplace_back(variable, backtrace);
} }
} }
void cmGlobVerificationManager::Reset()
{
this->Cache.clear();
this->VerifyScript.clear();
this->VerifyStamp.clear();
}

3
Source/cmGlobVerificationManager.h
View File

@@ -37,6 +37,9 @@ protected:
const std::string& variable, const std::string& variable,
const cmListFileBacktrace& bt); const cmListFileBacktrace& bt);
///! Clear the glob cache for state reset.
void Reset();
///! Check targets should be written in generated build system. ///! Check targets should be written in generated build system.
bool DoWriteVerifyTarget() const; bool DoWriteVerifyTarget() const;

1
Source/cmState.cxx
View File

@@ -267,6 +267,7 @@ cmStateSnapshot cmState::Reset()
{ {
this->GlobalProperties.clear(); this->GlobalProperties.clear();
this->PropertyDefinitions.clear(); this->PropertyDefinitions.clear();
this->GlobVerificationManager->Reset();
cmStateDetail::PositionType pos = this->SnapshotData.Truncate(); cmStateDetail::PositionType pos = this->SnapshotData.Truncate();
this->ExecutionListFiles.Truncate(); this->ExecutionListFiles.Truncate();