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
CMake
CMake
Commits
a1858136
Commit
a1858136
authored
Jun 21, 2015
by
Stephen Kelly
Browse files
cmMakefile: Rename parameter.
parent
ad47e6e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
a1858136
...
...
@@ -529,24 +529,24 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
}
}
bool
cmMakefile
::
ProcessBuildsystemFile
(
const
char
*
listfil
e
)
bool
cmMakefile
::
ProcessBuildsystemFile
(
const
char
*
filenam
e
)
{
this
->
AddDefinition
(
"CMAKE_PARENT_LIST_FILE"
,
listfil
e
);
this
->
AddDefinition
(
"CMAKE_PARENT_LIST_FILE"
,
filenam
e
);
std
::
string
curSrc
=
this
->
GetCurrentSourceDirectory
();
this
->
PushPolicyBarrier
();
bool
result
=
this
->
ReadListFile
(
listfil
e
,
bool
result
=
this
->
ReadListFile
(
filenam
e
,
curSrc
==
this
->
GetHomeDirectory
());
this
->
PopPolicyBarrier
(
!
cmSystemTools
::
GetFatalErrorOccured
());
this
->
EnforceDirectoryLevelRules
();
return
result
;
}
bool
cmMakefile
::
ReadDependentFile
(
const
char
*
listfil
e
,
bool
noPolicyScope
)
bool
cmMakefile
::
ReadDependentFile
(
const
char
*
filenam
e
,
bool
noPolicyScope
)
{
this
->
AddDefinition
(
"CMAKE_PARENT_LIST_FILE"
,
this
->
GetDefinition
(
"CMAKE_CURRENT_LIST_FILE"
));
IncludeScope
incScope
(
this
,
noPolicyScope
);
bool
result
=
this
->
ReadListFile
(
listfil
e
,
false
);
bool
result
=
this
->
ReadListFile
(
filenam
e
,
false
);
if
(
cmSystemTools
::
GetFatalErrorOccured
())
{
incScope
.
Quiet
();
...
...
@@ -554,20 +554,20 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
return
result
;
}
bool
cmMakefile
::
ReadListFile
(
const
char
*
listfil
e
)
bool
cmMakefile
::
ReadListFile
(
const
char
*
filenam
e
)
{
this
->
PushPolicyBarrier
();
bool
result
=
this
->
ReadListFile
(
listfil
e
,
false
);
bool
result
=
this
->
ReadListFile
(
filenam
e
,
false
);
this
->
PopPolicyBarrier
(
!
cmSystemTools
::
GetFatalErrorOccured
());
this
->
ListFileStack
.
pop_back
();
return
result
;
}
bool
cmMakefile
::
ReadListFile
(
const
char
*
listfil
e
,
bool
cmMakefile
::
ReadListFile
(
const
char
*
filenam
e
,
bool
requireProjectCommand
)
{
std
::
string
filenametoread
=
cmSystemTools
::
CollapseFullPath
(
listfil
e
,
cmSystemTools
::
CollapseFullPath
(
filenam
e
,
this
->
GetCurrentSourceDirectory
());
this
->
ListFileStack
.
push_back
(
filenametoread
);
...
...
Source/cmMakefile.h
View file @
a1858136
...
...
@@ -79,11 +79,11 @@ public:
*/
~
cmMakefile
();
bool
ReadListFile
(
const
char
*
listfil
e
);
bool
ReadListFile
(
const
char
*
filenam
e
);
bool
ReadDependentFile
(
const
char
*
listfil
e
,
bool
noPolicyScope
=
true
);
bool
ReadDependentFile
(
const
char
*
filenam
e
,
bool
noPolicyScope
=
true
);
bool
ProcessBuildsystemFile
(
const
char
*
listfil
e
);
bool
ProcessBuildsystemFile
(
const
char
*
filenam
e
);
/**
* Add a function blocker to this makefile
...
...
@@ -914,7 +914,7 @@ private:
cmState
::
Snapshot
StateSnapshot
;
bool
ReadListFile
(
const
char
*
listfil
e
,
bool
ReadListFile
(
const
char
*
filenam
e
,
bool
requireProjectCommand
);
bool
ParseDefineFlag
(
std
::
string
const
&
definition
,
bool
remove
);
...
...
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