diff options
| author | Marcus D. Hanwell <marcus.hanwell@kitware.com> | 2010-10-22 15:16:21 (GMT) |
|---|---|---|
| committer | Marcus D. Hanwell <marcus.hanwell@kitware.com> | 2010-10-22 15:16:21 (GMT) |
| commit | beeca11c9bcfd0cc211c8c73f4b00709c914eac3 (patch) | |
| tree | 8a6a8cfae418e71a31702c2f38428588529f93a4 | |
| parent | ef9dd49d3d7c424133e2cc41b4b5ccf79f1f8163 (diff) | |
| download | CMake-beeca11c9bcfd0cc211c8c73f4b00709c914eac3.zip CMake-beeca11c9bcfd0cc211c8c73f4b00709c914eac3.tar.gz CMake-beeca11c9bcfd0cc211c8c73f4b00709c914eac3.tar.bz2 | |
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.
| -rw-r--r-- | Modules/ExternalProject.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
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") |