kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marcus D. Hanwell 2010-10-22 11:16:21 -04:00
parent ef9dd49d3d
commit beeca11c9b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/ExternalProject.cmake
View File

@ -597,8 +597,7 @@ function(_ep_get_build_command name step cmd_var)
# CMake project. Select build command based on generator. # CMake project. Select build command based on generator.
get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR) get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
if("${CMAKE_GENERATOR}" MATCHES "Make" AND if("${CMAKE_GENERATOR}" MATCHES "Make" AND
("${cmake_generator}" STREQUAL "${CMAKE_GENERATOR}" OR ("${cmake_generator}" MATCHES "Make" OR NOT cmake_generator))
NOT cmake_generator))
# The project uses the same Makefile generator. Use recursive make. # The project uses the same Makefile generator. Use recursive make.
set(cmd "$(MAKE)") set(cmd "$(MAKE)")
if(step STREQUAL "INSTALL") if(step STREQUAL "INSTALL")