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

Merge topic 'external-project-extra-gen' 

beeca11 Fixed parallel build for generators with EXTRA.
This commit is contained in:
David Cole 2010-10-28 14:09:43 -04:00 committed by CMake Topic Stage
parent 424ba550e5 beeca11c9b
commit 5b43d8f8b1
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")