[Cmake-commits] CMake branch, next, updated. v3.0.0-3737-g7954330

[Brad King]

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  79543303ed53c098a233d94a86b2c112913792b5 (commit)
       via  04377f1b318020ef0c9fef099842f26290d19324 (commit)
      from  ea7095e300bd4ce044b52a843bbaa63d8911a727 (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=79543303ed53c098a233d94a86b2c112913792b5
commit 79543303ed53c098a233d94a86b2c112913792b5
Merge: ea7095e 04377f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 16 08:51:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 16 08:51:28 2014 -0400

    Merge topic 'ninja-avoid-double-phony' into next
    
    04377f1b Ninja: Remove CMake includes from explicit depends (#14972)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04377f1b318020ef0c9fef099842f26290d19324
commit 04377f1b318020ef0c9fef099842f26290d19324
Author:     Adam Strzelecki <ono at java.pl>
AuthorDate: Fri Jun 13 12:11:06 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 16 08:51:38 2014 -0400

    Ninja: Remove CMake includes from explicit depends (#14972)
    
    It may happen that CMake include is an explicit dependency for some command,
    while all CMake includes are set phony in WriteTargetRebuildManifest, this may
    lead to duplicate phony generate rules which causes ninja warnings.
    
    We need to remove implicit CMake includes in WriteUnknownExplicitDependencies.
    
    This fixes FindCUDA ninja warnings.

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();

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake