diff options
| author | David Cole <david.cole@kitware.com> | 2010-10-28 18:09:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-10-28 18:09:43 (GMT) |
| commit | 5b43d8f8b1cfd3e3acf1576b5bf2f910fb3c50db (patch) | |
| tree | 7ec1bf2efaab505358bd642a790a4b81cee8f0d4 /Modules | |
| parent | 424ba550e5b06c68df753ef7a190c0308b31b1b7 (diff) | |
| parent | beeca11c9bcfd0cc211c8c73f4b00709c914eac3 (diff) | |
| download | CMake-5b43d8f8b1cfd3e3acf1576b5bf2f910fb3c50db.zip CMake-5b43d8f8b1cfd3e3acf1576b5bf2f910fb3c50db.tar.gz CMake-5b43d8f8b1cfd3e3acf1576b5bf2f910fb3c50db.tar.bz2 | |
Merge topic 'external-project-extra-gen'
beeca11 Fixed parallel build for generators with EXTRA.
Diffstat (limited to 'Modules')
| -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") |