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

Merge topic 'fix-recursive-make-issue' 

b62fe12 ExternalProject: Use $(MAKE) whenever possible.
This commit is contained in:
Brad King 2010-07-27 15:03:07 -04:00 committed by CMake Topic Stage
parent 13d686331e b62fe1242f
commit f66b3220cd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/ExternalProject.cmake
View File

@ -563,8 +563,9 @@ function(_ep_get_build_command name step cmd_var)
if(cfg_cmd_id STREQUAL "cmake")
# 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}")
if("${CMAKE_GENERATOR}" MATCHES "Make" AND
("${cmake_generator}" STREQUAL "${CMAKE_GENERATOR}" OR
NOT cmake_generator))
# The project uses the same Makefile generator. Use recursive make.
set(cmd "$(MAKE)")
if(step STREQUAL "INSTALL")
@ -593,7 +594,8 @@ 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".
set(cmd "make")
# But use "$(MAKE)" to get recursive parallel make.
set(cmd "$(MAKE)")
if(step STREQUAL "INSTALL")
set(args install)
endif()