From c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 21 May 2012 14:49:00 -0400 Subject: [PATCH] ExternalProject: Fix 'make' builds with Ninja (#13159) Fix the build command when Ninja is the CMake Generator, but the external project is created for a project that does not use CMake but does use "make". --- Modules/ExternalProject.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 0353e4562..a0a9aead5 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()