From e0efbfdbe00f8ed8bad6b1909ba1d4cc38803a88 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Sun, 22 Apr 2012 00:08:36 -0400
Subject: [PATCH] ExternalProject: Fix build command for Ninja + make.

Fix the build command when Ninja is the CMake Generator, but the ExternalProject
is created for a project that does not use CMake but does use make.
---
 Modules/ExternalProject.cmake |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b6fe190..b8b3df0 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -688,8 +688,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 "Ninja")
+        set(cmd "make")
+      else()
+        # To try to get the parallel arguments.
+        set(cmd "$(MAKE)")
+      endif()
       if(step STREQUAL "INSTALL")
         set(args install)
       endif()
-- 
1.7.9.1

From bfeeb79b643c0f0685b216cf88d2c77f52036ae7 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Mon, 21 May 2012 14:49:00 -0400
Subject: [PATCH] ExternalProject: Fix build command for Ninja + make.

Fix the build command when Ninja is the CMake Generator, but the ExternalProject
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 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()
-- 
1.7.9.5