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
3b3ecdfa
Commit
3b3ecdfa
authored
May 13, 2016
by
Nicolas Despres
Committed by
Brad King
May 17, 2016
Browse files
Ninja: Pre-compute "all" build target name
parent
5ca72750
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmGlobalNinjaGenerator.cxx
View file @
3b3ecdfa
...
...
@@ -488,6 +488,8 @@ void cmGlobalNinjaGenerator::Generate()
this
->
OpenBuildFileStream
();
this
->
OpenRulesFileStream
();
this
->
TargetAll
=
"all"
;
this
->
PolicyCMP0058
=
this
->
LocalGenerators
[
0
]
->
GetMakefile
()
->
GetPolicyStatus
(
cmPolicies
::
CMP0058
);
...
...
@@ -1059,7 +1061,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
// should all match now.
std
::
vector
<
std
::
string
>
unknownExplicitDepends
;
this
->
CombinedCustomCommandExplicitDependencies
.
erase
(
"a
ll
"
);
this
->
CombinedCustomCommandExplicitDependencies
.
erase
(
this
->
TargetA
ll
);
std
::
set_difference
(
this
->
CombinedCustomCommandExplicitDependencies
.
begin
(),
this
->
CombinedCustomCommandExplicitDependencies
.
end
(),
...
...
@@ -1125,7 +1127,7 @@ void cmGlobalNinjaGenerator::WriteBuiltinTargets(std::ostream& os)
void
cmGlobalNinjaGenerator
::
WriteTargetAll
(
std
::
ostream
&
os
)
{
cmNinjaDeps
outputs
;
outputs
.
push_back
(
"a
ll
"
);
outputs
.
push_back
(
this
->
TargetA
ll
);
this
->
WritePhonyBuild
(
os
,
"The main all target."
,
outputs
,
this
->
AllDependencies
);
...
...
Source/cmGlobalNinjaGenerator.h
View file @
3b3ecdfa
...
...
@@ -397,6 +397,9 @@ private:
std
::
string
NinjaCommand
;
std
::
string
NinjaVersion
;
private:
std
::
string
TargetAll
;
};
#endif // ! cmGlobalNinjaGenerator_h
Brad King
@brad.king
mentioned in commit
e0da6c3b
·
May 19, 2016
mentioned in commit
e0da6c3b
mentioned in commit e0da6c3b562f7fd25b83b00c432f016439c24c22
Toggle commit list
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