Call Ninja Directly

This commit is contained in:
TheBrokenRail 2024-02-06 19:35:44 -05:00
parent 2d9d4a638a
commit 90a2b0ac85
2 changed files with 2 additions and 10 deletions

View File

@ -11,14 +11,6 @@ if(MCPI_IS_FLATPAK_BUILD)
set(QEMU_PATCH "sed" "-i" "s/libdrm/libdrm-dis/g" "<SOURCE_DIR>/meson.build") set(QEMU_PATCH "sed" "-i" "s/libdrm/libdrm-dis/g" "<SOURCE_DIR>/meson.build")
endif() endif()
# Inherit Make Jobserver ()If Present)
include(ProcessorCount)
ProcessorCount(NPROC)
set(MAKE "make" "-j${NPROC}")
if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
set(MAKE "$(MAKE)")
endif()
# Build # Build
include(ExternalProject) include(ExternalProject)
set(PKGCONFIG_ENV "") set(PKGCONFIG_ENV "")
@ -41,7 +33,7 @@ ExternalProject_Add(qemu
"--target-list=arm-linux-user" "--target-list=arm-linux-user"
"--without-default-features" "--without-default-features"
USES_TERMINAL_CONFIGURE TRUE USES_TERMINAL_CONFIGURE TRUE
BUILD_COMMAND ${MAKE} "qemu-arm" BUILD_COMMAND ninja "qemu-arm"
USES_TERMINAL_BUILD TRUE USES_TERMINAL_BUILD TRUE
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""

@ -1 +1 @@
Subproject commit fbdd1e27983eeb1329d51ee3264b2974c4901fbe Subproject commit 8bca4b7ec6aa28ef6fbc894d1f358468bcc4b321