[Cmake-commits] CMake branch, next, updated. v2.8.8-2908-gc3352f9

[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  c3352f94791c11a47050ef26515e4d7374d2bfb8 (commit)
       via  c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe (commit)
       via  4af648041dd1f5589bd117145b091fc088aee56e (commit)
       via  4742eec96a115641033662fd1594a96cea15cef7 (commit)
       via  e2d71bb69354facbdd1df4d487ee897cecb9f30e (commit)
       via  cb37cae6918782d5bef6d30c30bee033de000372 (commit)
      from  e86f944d54cc9cc59732a613e2dc483b56e0e730 (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=c3352f94791c11a47050ef26515e4d7374d2bfb8
commit c3352f94791c11a47050ef26515e4d7374d2bfb8
Merge: e86f944 c9097c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 21 18:59:49 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 21 18:59:49 2012 -0400

    Merge topic 'ExternalProject-Ninja-superbuild' into next
    
    c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
    4af6480 CMake Nightly Date Stamp
    4742eec CMake Nightly Date Stamp
    e2d71bb CMake Nightly Date Stamp
    cb37cae CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe
commit c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Mon May 21 14:49:00 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 21 18:57:11 2012 -0400

    ExternalProject: Fix 'make' builds with Ninja (#13159)
    
    Fix the build command when Ninja is the CMake Generator, but the
    external project is created for a project that does not use CMake but
    does use "make".

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0353e45..a0a9aea 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -712,8 +712,12 @@ function(_ep_get_build_command name step cmd_var)
       endif()
     else() # if(cfg_cmd_id STREQUAL "configure")
       # Non-CMake project.  Guess "make" and "make install" and "make test".
-      # But use "$(MAKE)" to get recursive parallel make.
-      set(cmd "$(MAKE)")
+      if("${CMAKE_GENERATOR}" MATCHES "Makefiles")
+        # Try to get the parallel arguments
+        set(cmd "$(MAKE)")
+      else()
+        set(cmd "make")
+      endif()
       if(step STREQUAL "INSTALL")
         set(args install)
       endif()

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

Summary of changes:
 Modules/ExternalProject.cmake |    8 ++++++--
 Source/CMakeVersion.cmake     |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake