Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bill Hoffman
CMake
Commits
6f3b9e8b
Commit
6f3b9e8b
authored
Aug 09, 2018
by
Shane Parris
Committed by
Brad King
Aug 09, 2018
Browse files
cmState: Clear GlobVerificationManager state on Reset
It should not persist across multiple configure rounds. Fixes: #18208
parent
c4ab0980
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/cmGlobVerificationManager.cxx
View file @
6f3b9e8b
...
...
@@ -170,3 +170,10 @@ void cmGlobVerificationManager::AddCacheEntry(
value
.
Backtraces
.
emplace_back
(
variable
,
backtrace
);
}
}
void
cmGlobVerificationManager
::
Reset
()
{
this
->
Cache
.
clear
();
this
->
VerifyScript
.
clear
();
this
->
VerifyStamp
.
clear
();
}
Source/cmGlobVerificationManager.h
View file @
6f3b9e8b
...
...
@@ -37,6 +37,9 @@ protected:
const
std
::
string
&
variable
,
const
cmListFileBacktrace
&
bt
);
///! Clear the glob cache for state reset.
void
Reset
();
///! Check targets should be written in generated build system.
bool
DoWriteVerifyTarget
()
const
;
...
...
Source/cmState.cxx
View file @
6f3b9e8b
...
...
@@ -267,6 +267,7 @@ cmStateSnapshot cmState::Reset()
{
this
->
GlobalProperties
.
clear
();
this
->
PropertyDefinitions
.
clear
();
this
->
GlobVerificationManager
->
Reset
();
cmStateDetail
::
PositionType
pos
=
this
->
SnapshotData
.
Truncate
();
this
->
ExecutionListFiles
.
Truncate
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment