Explorar el Código

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".
Matt McCormick hace 13 años
padre
commit
c9097c74b6
Se han modificado 1 ficheros con 6 adiciones y 2 borrados
  1. 6 2
      Modules/ExternalProject.cmake

+ 6 - 2
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()