diff options
| author | David Cole <david.cole@kitware.com> | 2012-05-24 17:38:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-05-24 17:38:25 (GMT) |
| commit | 68d177432795f0113af9cb9efd2f428705a996a2 (patch) | |
| tree | 1b6a3f3de35576aa75d28ce5f3b44e9f1528ffd3 /Modules | |
| parent | 3e23da0688d68a6c5555a36e65bd6eaf9a435750 (diff) | |
| parent | c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe (diff) | |
| download | CMake-68d177432795f0113af9cb9efd2f428705a996a2.zip CMake-68d177432795f0113af9cb9efd2f428705a996a2.tar.gz CMake-68d177432795f0113af9cb9efd2f428705a996a2.tar.bz2 | |
Merge topic 'ExternalProject-Ninja-superbuild'
c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 0353e45..a0a9aea 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -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() |