Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Cristian Adam
CMake
Commits
732dd344
Commit
732dd344
authored
Jan 06, 2017
by
Daniel Pfeifer
Committed by
wahikihiki
Jul 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmCommand: remove FinalPass from interface
parent
fbee46e2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
34 deletions
+0
-34
Source/cmCommand.h
Source/cmCommand.h
+0
-13
Source/cmDisallowedCommand.h
Source/cmDisallowedCommand.h
+0
-4
Source/cmMakefile.cxx
Source/cmMakefile.cxx
+0
-17
No files found.
Source/cmCommand.h
View file @
732dd344
...
...
@@ -60,19 +60,6 @@ public:
virtual
bool
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
,
cmExecutionStatus
&
)
=
0
;
/**
* This is called at the end after all the information
* specified by the command is accumulated. Most commands do
* not implement this method. At this point, reading and
* writing to the cache can be done.
*/
virtual
void
FinalPass
()
{}
/**
* Does this command have a final pass? Query after InitialPass.
*/
virtual
bool
HasFinalPass
()
const
{
return
false
;
}
/**
* This is a virtual constructor for the command.
*/
...
...
Source/cmDisallowedCommand.h
View file @
732dd344
...
...
@@ -38,10 +38,6 @@ public:
bool
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
,
cmExecutionStatus
&
status
)
override
;
void
FinalPass
()
override
{
this
->
Command
->
FinalPass
();
}
bool
HasFinalPass
()
const
override
{
return
this
->
Command
->
HasFinalPass
();
}
private:
std
::
unique_ptr
<
cmCommand
>
Command
;
cmPolicies
::
PolicyID
Policy
;
...
...
Source/cmMakefile.cxx
View file @
732dd344
...
...
@@ -355,20 +355,6 @@ private:
cmMakefile
*
Makefile
;
};
class
cmFinalPassAction
{
public:
cmFinalPassAction
(
std
::
unique_ptr
<
cmCommand
>
command
)
:
Command
(
std
::
move
(
command
))
{
}
void
operator
()(
cmMakefile
&
)
{
this
->
Command
->
FinalPass
();
}
private:
std
::
shared_ptr
<
cmCommand
>
Command
;
};
bool
cmMakefile
::
ExecuteCommand
(
const
cmListFileFunction
&
lff
,
cmExecutionStatus
&
status
)
{
...
...
@@ -429,9 +415,6 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
if
(
this
->
GetCMakeInstance
()
->
GetWorkingMode
()
!=
cmake
::
NORMAL_MODE
)
{
cmSystemTools
::
SetFatalErrorOccured
();
}
}
else
if
(
pcmd
->
HasFinalPass
())
{
// use the command
this
->
AddFinalAction
(
cmFinalPassAction
(
std
::
move
(
pcmd
)));
}
}
}
else
{
...
...
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