This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 36611418ab5eb86158beb235a7c26b43fa057015 (commit)
via f288383b3ff3f1c095ecefc41e53a638f76e9744 (commit)
via ba55fc2aa5f80efb49f53eba2bf8f2e1d2b6899a (commit)
via 8494bc271399cf4e474f640fde08e6cd61d932da (commit)
via c22a2b49afed255593d1cc8425a5fd1fd2e1a81c (commit)
via 588fa1bb9eed6e838f58d4f1fb1d01d83ecfd820 (commit)
via b289243d993b697594a5593033b9178b0511a177 (commit)
via bf9afa1e15f9d61850143ad279d1fc1d515c84d1 (commit)
via e7a760fe7d20b5c3da53e2daa415ac09865da78c (commit)
from db20cb2f9f2ff1d00593e0fc921184d99f58749a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36611418ab5eb86158beb235a7c26b43fa057015
commit 36611418ab5eb86158beb235a7c26b43fa057015
Merge: f288383 b289243
Author: Brad King
AuthorDate: Tue Mar 26 15:00:02 2019 +
Commit: Kitware Robot
CommitDate: Tue Mar 26 11:00:44 2019 -0400
Merge topic 'cmGlobalGenerator_code_maintenance'
b289243d99 cmGlobalGenerator: Inline `aRange` acquisition in
`for(x:aRange)` invocations
bf9afa1e15 cmGlobalGenerator: Use auto for long iterator types
Acked-by: Kitware Robot
Acked-by: Daniel Pfeifer
Merge-request: !3144
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f288383b3ff3f1c095ecefc41e53a638f76e9744
commit f288383b3ff3f1c095ecefc41e53a638f76e9744
Merge: ba55fc2 e7a760f
Author: Brad King
AuthorDate: Tue Mar 26 14:59:48 2019 +
Commit: Kitware Robot
CommitDate: Tue Mar 26 10:59:57 2019 -0400
Merge topic 'fix_autogen_deadlock'
e7a760fe7d Autogen: Fix deadlock when uv_spawn() fails while trying to run
moc
Acked-by: Kitware Robot
Tested-by: Sebastian Holtermann
Merge-request: !3139
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba55fc2aa5f80efb49f53eba2bf8f2e1d2b6899a
commit ba55fc2aa5f80efb49f53eba2bf8f2e1d2b6899a
Merge: 8494bc2 c22a2b4
Author: Brad King
AuthorDate: Tue Mar 26 10:57:26 2019 -0400
Commit: Brad King
CommitDate: Tue Mar 26 10:57:26 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8494bc271399cf4e474f640fde08e6cd61d932da
commit 8494bc271399cf4e474f640fde08e6cd61d932da
Merge: db20cb2 588fa1b
Author: Brad King
AuthorDate: Tue Mar 26 14:56:27 2019 +
Commit: Kitware Robot
CommitDate: Tue Mar 26 10:56:34 2019 -0400
Merge topic 'toolchain-include_directories'
588fa1bb9e Restore support for include_directories() in toolchain files
Acked-by: Kitware Robot
Merge-request: !3140
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b289243d993b697594a5593033b9178b0511a177
commit b289243d993b697594a5593033b9178b0511a177
Author: Sebastian Holtermann
AuthorDate: Mon Mar 25 11:21:07 2019 +0100
Commit: Sebastian Holtermann
CommitDate: Mon Mar 25 13:51:22 2019 +0100
cmGlobalGenerator: Inline `aRange` acquisition in `for(x:aRange)`
invocations
Changes the following code snippets in `cmGlobalGenerator`
```
AType aRange = object.getRange();
for ( auto & item: aRange) {
```
to
```
for ( auto & item: object.getRange()) {
```
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8db6988..d5ea924 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -298,10 +298,7 @@ bool cmGlobalGenerator::CheckTargetsForMissingSources()
const
{
bool failed = false;
for (cmLocalGenerator* localGen : this->LocalGenerators) {
-const std::vector& targets =
- localGen->GetGeneratorTargets();
-
-for (cmGeneratorTarget* target : targets) {
+for (cmGeneratorTarget* target : localGen->GetGeneratorTargets()) {
if (target->GetType() == cmStateEnums::TargetType::GLOBAL_TARGET ||
target->GetType() == cmStateEnums::TargetType::INTERFACE_LIBRARY ||
target->GetType() == cmStateEnums::TargetType::UTILITY ||
@@ -1496,8 +1493,7 @@ bool cmGlobalGenerator::ComputeTargetDepends()
if (!ctd.Compute()) {
return false;
}
- std::vector const& targets = ctd.GetTargets();
- for (cmGeneratorTarget const* target : targets) {
+ for (cmGeneratorTarget const* target : ctd.GetTargets()) {
ctd.GetTargetDirectDepends(target, this->TargetDependencies[target]);
}
return true;
@@ -1537,8 +1533,7 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
const cmBacktraceRange noconfig_compile_definitions_bts =
mf->GetCompileDefinitionsBacktraces();
-cmTargets& targets = mf->GetTargets();
-
