[Cmake-commits] CMake branch, next, updated. v2.8.2-1094-g0d0b39d

[Marcus D. Hanwell]

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  0d0b39dec91fae1187047e672ed12ef0659925a7 (commit)
       via  beeca11c9bcfd0cc211c8c73f4b00709c914eac3 (commit)
      from  ee0ef5bdc84118423203bea83995a980305a17b4 (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=0d0b39dec91fae1187047e672ed12ef0659925a7
commit 0d0b39dec91fae1187047e672ed12ef0659925a7
Merge: ee0ef5b beeca11
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Fri Oct 22 11:19:26 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 22 11:19:26 2010 -0400

    Merge topic 'external-project-extra-gen' into next
    
    beeca11 Fixed parallel build for generators with EXTRA.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=beeca11c9bcfd0cc211c8c73f4b00709c914eac3
commit beeca11c9bcfd0cc211c8c73f4b00709c914eac3
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Fri Oct 22 11:16:21 2010 -0400
Commit:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
CommitDate: Fri Oct 22 11:16:21 2010 -0400

    Fixed parallel build for generators with EXTRA.
    
    Fixed parallel build for projects using generators that have the
    CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
    for helping me to track this one down, I missed parallel builds.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d76796f..dfd96cd 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -597,8 +597,7 @@ function(_ep_get_build_command name step cmd_var)
       # 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}" OR
-          NOT cmake_generator))
+         ("${cmake_generator}" MATCHES "Make" OR NOT cmake_generator))
         # The project uses the same Makefile generator.  Use recursive make.
         set(cmd "$(MAKE)")
         if(step STREQUAL "INSTALL")

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

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


hooks/post-receive
-- 
CMake