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
a6e661b8
Commit
a6e661b8
authored
Jun 21, 2015
by
Stephen Kelly
Browse files
cmMakefile: Rename variables.
parent
fe38bb2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
a6e661b8
...
...
@@ -576,12 +576,12 @@ bool cmMakefile::ReadListFile(const char* listfile,
this
->
ListFileStack
.
push_back
(
filenametoread
);
cmListFile
cache
File
;
bool
res
=
cache
File
.
ParseFile
(
filenametoread
.
c_str
(),
requireProjectCommand
,
this
);
cmListFile
list
File
;
bool
res
=
list
File
.
ParseFile
(
filenametoread
.
c_str
(),
requireProjectCommand
,
this
);
if
(
res
)
{
this
->
ReadListFileInternal
(
cache
File
,
filenametoread
.
c_str
(),
this
->
ReadListFileInternal
(
list
File
,
filenametoread
.
c_str
(),
noPolicyScope
);
}
...
...
@@ -601,7 +601,7 @@ bool cmMakefile::ReadListFile(const char* listfile,
return
res
;
}
void
cmMakefile
::
ReadListFileInternal
(
cmListFile
const
&
cache
File
,
void
cmMakefile
::
ReadListFileInternal
(
cmListFile
const
&
list
File
,
const
char
*
filenametoread
,
bool
noPolicyScope
)
{
...
...
@@ -614,11 +614,11 @@ void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile,
IncludeScope
incScope
(
this
,
filenametoread
,
noPolicyScope
);
// Run the parsed commands.
const
size_t
numberFunctions
=
cache
File
.
Functions
.
size
();
const
size_t
numberFunctions
=
list
File
.
Functions
.
size
();
for
(
size_t
i
=
0
;
i
<
numberFunctions
;
++
i
)
{
cmExecutionStatus
status
;
this
->
ExecuteCommand
(
cache
File
.
Functions
[
i
],
status
);
this
->
ExecuteCommand
(
list
File
.
Functions
[
i
],
status
);
if
(
cmSystemTools
::
GetFatalErrorOccured
())
{
// Exit early due to error.
...
...
Source/cmMakefile.h
View file @
a6e661b8
...
...
@@ -918,7 +918,7 @@ private:
bool
noPolicyScope
,
bool
requireProjectCommand
);
void
ReadListFileInternal
(
cmListFile
const
&
cache
File
,
void
ReadListFileInternal
(
cmListFile
const
&
list
File
,
const
char
*
filenametoread
,
bool
noPolicyScope
);
...
...
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