diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-16 12:54:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-16 12:54:46 (GMT) |
| commit | 0b028c6f0a44d3b0956170b39fbe921eb8d13f42 (patch) | |
| tree | 360f2e064b9e4a75588b6397e6c5d94fb99faf8b /Source | |
| parent | 3eb50bbe8c99e3480b0ca85dc3d49b0a8ca9d8d1 (diff) | |
| parent | 04377f1b318020ef0c9fef099842f26290d19324 (diff) | |
| download | CMake-0b028c6f0a44d3b0956170b39fbe921eb8d13f42.zip CMake-0b028c6f0a44d3b0956170b39fbe921eb8d13f42.tar.gz CMake-0b028c6f0a44d3b0956170b39fbe921eb8d13f42.tar.bz2 | |
Merge topic 'ninja-avoid-double-phony'
04377f1b Ninja: Remove CMake includes from explicit depends (#14972)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index a0caf0e..0facfeb 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -961,7 +961,16 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os) { knownDependencies.insert( ng->ConvertToNinjaPath( j->c_str() ) ); } + //get list files which are implicit dependencies as well and will be phony + //for rebuild manifest + std::vector<std::string> const& lf = (*i)->GetMakefile()->GetListFiles(); + typedef std::vector<std::string>::const_iterator vect_it; + for(vect_it j = lf.begin(); j != lf.end(); ++j) + { + knownDependencies.insert( ng->ConvertToNinjaPath( j->c_str() ) ); + } } + knownDependencies.insert( "CMakeCache.txt" ); for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator li = this->EvaluationFiles.begin(); |