summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-01-16 14:24:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-01-16 14:24:15 (GMT)
commit9465242d0110d1f9b9c0a68aa8bca80d400f52d1 (patch)
tree0ea833a83024f359907126a2fdf1efc2f1d0a612
parentce362f27d69686b3d72978e5ae0182357737c1a9 (diff)
parent20e595aba813db064fa63b92af33472efe969392 (diff)
downloadCMake-9465242d0110d1f9b9c0a68aa8bca80d400f52d1.zip
CMake-9465242d0110d1f9b9c0a68aa8bca80d400f52d1.tar.gz
CMake-9465242d0110d1f9b9c0a68aa8bca80d400f52d1.tar.bz2
Merge topic 'ninja_fix_rerun'
20e595ab Revert "Ninja: Track configured files so we can regenerate them."
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index ec91b0f..5e1f1ed 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1115,9 +1115,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()),