[Cmake-commits] CMake branch, next, updated. v3.0.0-3715-g866ac68

[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  866ac68f6f540fbfa1d626dcf516cfee3ff85599 (commit)
       via  393babd7d34352d2fda4748921ba3c45a90badf9 (commit)
      from  ffc8a8dbda5595d3a24dec356b3eab2c6c4427eb (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=866ac68f6f540fbfa1d626dcf516cfee3ff85599
commit 866ac68f6f540fbfa1d626dcf516cfee3ff85599
Merge: ffc8a8d 393babd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 13 09:53:50 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 13 09:53:50 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=393babd7d34352d2fda4748921ba3c45a90badf9
commit 393babd7d34352d2fda4748921ba3c45a90badf9
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: Fri Jun 13 09:48:46 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 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();

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)


hooks/post-receive
-- 
CMake