Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
254be613
Commit
254be613
authored
Jun 21, 2015
by
Stephen Kelly
Browse files
cmMakefile: Move resource management into the IncludeScope.
parent
826b6e68
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
254be613
...
...
@@ -486,6 +486,7 @@ cmMakefile::IncludeScope::~IncludeScope()
this
->
EnforceCMP0011
();
}
}
this
->
Makefile
->
ListFileStack
.
pop_back
();
}
//----------------------------------------------------------------------------
...
...
@@ -544,16 +545,12 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
{
this
->
AddDefinition
(
"CMAKE_PARENT_LIST_FILE"
,
this
->
GetDefinition
(
"CMAKE_CURRENT_LIST_FILE"
));
bool
result
=
false
;
{
IncludeScope
incScope
(
this
,
noPolicyScope
);
result
=
this
->
ReadListFile
(
listfile
,
false
);
bool
result
=
this
->
ReadListFile
(
listfile
,
false
);
if
(
cmSystemTools
::
GetFatalErrorOccured
())
{
incScope
.
Quiet
();
}
}
this
->
ListFileStack
.
pop_back
();
return
result
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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