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
0397c92a
Commit
0397c92a
authored
May 13, 2016
by
Nicolas Despres
Committed by
Brad King
May 17, 2016
Browse files
Ninja: Pre-compute "CMakeCache.txt" build target name
parent
3b3ecdfa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmGlobalNinjaGenerator.cxx
View file @
0397c92a
...
...
@@ -489,6 +489,7 @@ void cmGlobalNinjaGenerator::Generate()
this
->
OpenRulesFileStream
();
this
->
TargetAll
=
"all"
;
this
->
CMakeCacheFile
=
"CMakeCache.txt"
;
this
->
PolicyCMP0058
=
this
->
LocalGenerators
[
0
]
->
GetMakefile
()
->
GetPolicyStatus
(
...
...
@@ -1040,7 +1041,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
}
}
}
knownDependencies
.
insert
(
"
CMakeCache
.txt"
);
knownDependencies
.
insert
(
this
->
CMakeCache
File
);
for
(
TargetAliasMap
::
const_iterator
i
=
this
->
TargetAliases
.
begin
();
i
!=
this
->
TargetAliases
.
end
();
++
i
)
{
...
...
@@ -1168,7 +1169,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
implicitDeps
.
push_back
(
this
->
ConvertToNinjaPath
(
*
fi
));
}
}
implicitDeps
.
push_back
(
"
CMakeCache
.txt"
);
implicitDeps
.
push_back
(
this
->
CMakeCache
File
);
std
::
sort
(
implicitDeps
.
begin
(),
implicitDeps
.
end
());
implicitDeps
.
erase
(
std
::
unique
(
implicitDeps
.
begin
(),
implicitDeps
.
end
()),
...
...
Source/cmGlobalNinjaGenerator.h
View file @
0397c92a
...
...
@@ -400,6 +400,7 @@ private:
private:
std
::
string
TargetAll
;
std
::
string
CMakeCacheFile
;
};
#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