[Cmake-commits] CMake branch, next, updated. v2.8.2-270-g4ee6fab

[David Cole]

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  4ee6fab20aa7451d94b7c01abcd728135746c9db (commit)
       via  b62fe1242f7d621d0b68657dfc9fadb1cef7ce6e (commit)
       via  0c084dd899c28c9ff65caacf3f917bcaf1a6726f (commit)
       via  aa1fce9781cd1cbf89e41e9278d9fd758de915ca (commit)
       via  a2eaf6b415a46c739940d55fa48698f8270c2b21 (commit)
      from  ebe0f00bdbf89b2fa88f15c41faccbd8908e19da (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=4ee6fab20aa7451d94b7c01abcd728135746c9db
commit 4ee6fab20aa7451d94b7c01abcd728135746c9db
Merge: ebe0f00 b62fe12
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 23 14:25:40 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 23 14:25:40 2010 -0400

    Merge topic 'fix-recursive-make-issue' into next
    
    b62fe12 ExternalProject: Use $(MAKE) whenever possible.
    0c084dd KWSys Nightly Date Stamp
    aa1fce9 KWSys Nightly Date Stamp
    a2eaf6b KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b62fe1242f7d621d0b68657dfc9fadb1cef7ce6e
commit b62fe1242f7d621d0b68657dfc9fadb1cef7ce6e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 23 13:51:37 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jul 23 13:51:37 2010 -0400

    ExternalProject: Use $(MAKE) whenever possible.
    
    ExternalProject_Add calls that did not explicitly request a
    CMAKE_GENERATOR would not get recursive parallel make behavior.
    This commit fixes that issue.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b74f207..b4359c8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -563,8 +563,9 @@ function(_ep_get_build_command name step cmd_var)
     if(cfg_cmd_id STREQUAL "cmake")
       # CMake project.  Select build command based on generator.
       get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
-      if("${cmake_generator}" MATCHES "Make" AND
-          "${cmake_generator}" STREQUAL "${CMAKE_GENERATOR}")
+      if("${CMAKE_GENERATOR}" MATCHES "Make" AND
+          ("${cmake_generator}" STREQUAL "${CMAKE_GENERATOR}" OR
+          NOT cmake_generator))
         # The project uses the same Makefile generator.  Use recursive make.
         set(cmd "$(MAKE)")
         if(step STREQUAL "INSTALL")
@@ -593,7 +594,8 @@ 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".
-      set(cmd "make")
+      # But use "$(MAKE)" to get recursive parallel make.
+      set(cmd "$(MAKE)")
       if(step STREQUAL "INSTALL")
         set(args install)
       endif()

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

Summary of changes:
 Modules/ExternalProject.cmake     |    8 +++++---
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake