[Cmake-commits] CMake branch, next, updated. v3.2.1-1083-gacfc07a

[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  acfc07a851ee91fed1e29c6e53abd9794991eb72 (commit)
       via  80afe28a1084d02dc3e010c7a0cabf5258237ddc (commit)
      from  ef88ba3fe1f16d8663109eb77b1931a3fedba443 (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=acfc07a851ee91fed1e29c6e53abd9794991eb72
commit acfc07a851ee91fed1e29c6e53abd9794991eb72
Merge: ef88ba3 80afe28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 18 13:03:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 18 13:03:50 2015 -0400

    Merge topic 'ninja-no-circular-phony' into next
    
    80afe28a Ninja: Do not generate circular phony rules (#15454)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80afe28a1084d02dc3e010c7a0cabf5258237ddc
commit 80afe28a1084d02dc3e010c7a0cabf5258237ddc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 18 12:51:28 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 18 12:55:27 2015 -0400

    Ninja: Do not generate circular phony rules (#15454)
    
    The phony rules added by commit v2.8.12~248^2 (Ninja: Custom Command
    file depends don't need to exist before building, 2013-06-07) are
    circular, e.g.
    
      build side-effect: phony side-effect
    
    This is not diagnosed by Ninja as of version 1.5, but the dependency
    does not make sense.  Simply drop it and use phony rules of the form
    
      build side-effect: phony
    
    instead.
    
    Reported-by: Daniel Dunbar

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 69b1a9d..ac7a6eb 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1069,7 +1069,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
       this->WritePhonyBuild(os,
                             "",
                             deps,
-                            deps);
+                            cmNinjaDeps());
       }
    }
 }

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake