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
e53072d6
Commit
e53072d6
authored
Jun 21, 2015
by
Stephen Kelly
Browse files
cmMakefile: Move IncludeScope instance.
parent
b7166afa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
e53072d6
...
...
@@ -558,6 +558,8 @@ bool cmMakefile::ReadListFile(const char* listfile,
bool
noPolicyScope
,
bool
requireProjectCommand
)
{
IncludeScope
incScope
(
this
,
noPolicyScope
);
std
::
string
filenametoread
=
cmSystemTools
::
CollapseFullPath
(
listfile
,
this
->
GetCurrentSourceDirectory
());
...
...
@@ -587,7 +589,6 @@ bool cmMakefile::ReadListFile(const char* listfile,
this
->
MarkVariableAsUsed
(
"CMAKE_CURRENT_LIST_FILE"
);
this
->
MarkVariableAsUsed
(
"CMAKE_CURRENT_LIST_DIR"
);
IncludeScope
incScope
(
this
,
noPolicyScope
);
this
->
ReadListFileInternal
(
listFile
);
if
(
cmSystemTools
::
GetFatalErrorOccured
())
{
...
...
Write
Preview
Supports
Markdown
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