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

Merge topic 'ExternalProject-Ninja-superbuild' 

c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
This commit is contained in:
David Cole 2012-05-24 13:38:25 -04:00 committed by CMake Topic Stage
parent 3e23da0688 c9097c74b6
commit 68d1774327
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/ExternalProject.cmake
View File

@ -712,8 +712,12 @@ function(_ep_get_build_command name step cmd_var)
endif()
else() # if(cfg_cmd_id STREQUAL "configure")
# Non-CMake project. Guess "make" and "make install" and "make test".
# But use "$(MAKE)" to get recursive parallel make.
set(cmd "$(MAKE)")
if("${CMAKE_GENERATOR}" MATCHES "Makefiles")
# Try to get the parallel arguments
set(cmd "$(MAKE)")
else()
set(cmd "make")
endif()
if(step STREQUAL "INSTALL")
set(args install)
endif()