Przeglądaj źródła

Use $(MAKE) as a build command to propagate parallel make option.

Sascha Zelzer 13 lat temu
rodzic
commit
0c2cb2922a
1 zmienionych plików z 8 dodań i 2 usunięć
  1. 8 2
      SuperBuild.cmake

+ 8 - 2
SuperBuild.cmake

@@ -257,6 +257,12 @@ ExternalProject_Add(${proj}
   DEPENDS
     ${CTK_DEPENDS}
   )
+  
+IF(CMAKE_GENERATOR MATCHES ".*Makefiles.*")
+  SET(ctk_build_cmd "$(MAKE)")
+ELSE()
+  SET(ctk_build_cmd ${CMAKE_COMMAND} --build ${CTK_BINARY_DIR}/CTK-build --config ${CMAKE_CFG_INTDIR})
+ENDIF()
 
 #-----------------------------------------------------------------------------
 # CTK
@@ -269,7 +275,7 @@ ELSE()
 ENDIF()
 
 ADD_CUSTOM_TARGET(CTK-build ${CTKBUILD_TARGET_ALL_OPTION}
-  COMMAND ${CMAKE_COMMAND} --build ${CTK_BINARY_DIR}/CTK-build --config ${CMAKE_CFG_INTDIR}
+  COMMAND ${ctk_build_cmd}
   WORKING_DIRECTORY ${CTK_BINARY_DIR}/CTK-build
   )
 ADD_DEPENDENCIES(CTK-build CTK-Configure)
@@ -278,6 +284,6 @@ ADD_DEPENDENCIES(CTK-build CTK-Configure)
 # Custom target allowing to drive the build of CTK project itself
 #
 ADD_CUSTOM_TARGET(CTK
-  COMMAND ${CMAKE_COMMAND} --build ${CTK_BINARY_DIR}/CTK-build --config ${CMAKE_CFG_INTDIR}
+  COMMAND ${ctk_build_cmd}
   WORKING_DIRECTORY ${CTK_BINARY_DIR}/CTK-build
   )