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, next has been updated
via 890f8cd2ba6db9802f8447ea6674cb7a8d36450b (commit)
via 20e595aba813db064fa63b92af33472efe969392 (commit)
from 92ec2a5ee67daea977d403062f1e62a14eee561e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=890f8cd2ba6db9802f8447ea6674cb7a8d36450b
commit 890f8cd2ba6db9802f8447ea6674cb7a8d36450b
Merge: 92ec2a5 20e595a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 15 16:39:05 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 15 16:39:05 2014 -0500
Merge topic 'ninja_fix_rerun' into next
20e595ab Revert "Ninja: Track configured files so we can regenerate them."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20e595aba813db064fa63b92af33472efe969392
commit 20e595aba813db064fa63b92af33472efe969392
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 15 16:37:25 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 15 16:37:25 2014 -0500
Revert "Ninja: Track configured files so we can regenerate them."
Revert commit 4a6397a7 (Ninja: Track configured files so we can
regenerate them, 2013-06-17). The files reported by the method
cmMakefile::GetOutputFiles() must cause CMake to re-run only if they are
missing and without considering a timestamp. This is not the meaning of
the implicit dependencies field so Ninja re-runs CMake too often.
Another solution will have to be found to the original problem.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 61d0272..1953546 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1094,9 +1094,6 @@ void
cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i) {
const std::vector<std::string>& lf = (*i)->GetMakefile()->GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
-
- const std::vector<std::string>& of = (*i)->GetMakefile()->GetOutputFiles();
- implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
}
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 3 ---
1 file changed, 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
