diff options
| author | Brad King <brad.king@kitware.com> | 2010-07-27 19:03:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-07-27 19:03:07 (GMT) |
| commit | f66b3220cd570ac017ec9ad28659d0f43ae528f0 (patch) | |
| tree | 95e3a84e68aa882b2bc9f5575dff775e72447ad7 | |
| parent | 13d686331e5bf410290dee530051987161173d86 (diff) | |
| parent | b62fe1242f7d621d0b68657dfc9fadb1cef7ce6e (diff) | |
| download | CMake-f66b3220cd570ac017ec9ad28659d0f43ae528f0.zip CMake-f66b3220cd570ac017ec9ad28659d0f43ae528f0.tar.gz CMake-f66b3220cd570ac017ec9ad28659d0f43ae528f0.tar.bz2 | |
Merge topic 'fix-recursive-make-issue'
b62fe12 ExternalProject: Use $(MAKE) whenever possible.
| -rw-r--r-- | Modules/ExternalProject.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index b74f207..b4359c8 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -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() |