diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-16 12:53:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-16 12:53:00 (GMT) |
| commit | 15c6d352efa66b85a2cde06b7ccb1ef2b9458439 (patch) | |
| tree | f65e4b6e54fac8b47e6d8ec5d7c10ad405d8d07c /Source | |
| parent | a03dbf10430a34bf9cd08f70ba5225423bcd25f7 (diff) | |
| parent | 04377f1b318020ef0c9fef099842f26290d19324 (diff) | |
| download | CMake-15c6d352efa66b85a2cde06b7ccb1ef2b9458439.zip CMake-15c6d352efa66b85a2cde06b7ccb1ef2b9458439.tar.gz CMake-15c6d352efa66b85a2cde06b7ccb1ef2b9458439.tar.bz2 | |
Merge branch 'ninja-avoid-double-phony' into release
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 731bc00..60643ac 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -972,7 +972,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(); |