[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-203-g10387bf

[Ben Boeckel]

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  10387bf9de790b468b93c822d0b6c24a53ac892d (commit)
       via  f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 (commit)
      from  f2efb33191d8ff719ae004698c6b6acf2cc0492b (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=10387bf9de790b468b93c822d0b6c24a53ac892d
commit 10387bf9de790b468b93c822d0b6c24a53ac892d
Merge: f2efb33 f04e0a2
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Oct 29 13:04:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 29 13:04:08 2014 -0400

    Merge topic 'dev/alternate-generator-binaries' into next
    
    f04e0a2b ninja: Find alternate Ninja-compatible binaries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f04e0a2b178ec95138a2fbb7d4f5623ca41385e2
commit f04e0a2b178ec95138a2fbb7d4f5623ca41385e2
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 19:54:06 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Oct 29 13:03:43 2014 -0400

    ninja: Find alternate Ninja-compatible binaries
    
    On Red Hat distros, Ninja is /usr/bin/ninja-build because /usr/bin/ninja
    is an IRC bot.

diff --git a/Modules/CMakeNinjaFindMake.cmake b/Modules/CMakeNinjaFindMake.cmake
index c3ca767..2f35cf4 100644
--- a/Modules/CMakeNinjaFindMake.cmake
+++ b/Modules/CMakeNinjaFindMake.cmake
@@ -12,6 +12,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-find_program(CMAKE_MAKE_PROGRAM ninja
+find_program(CMAKE_MAKE_PROGRAM
+  NAMES ninja-build ninja
   DOC "Program used to build from build.ninja files.")
 mark_as_advanced(CMAKE_MAKE_PROGRAM)

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

Summary of changes:
 Modules/CMakeNinjaFindMake.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake