From 12785240ca92bb623e1f836b4c81238d875198cd Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 12 Oct 2023 11:11:41 +0200 Subject: build: switch to ninja multi-config generator --- source/arch/x86_64/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/arch/x86_64/CMakeLists.txt b/source/arch/x86_64/CMakeLists.txt index f917cd0..6ff1332 100644 --- a/source/arch/x86_64/CMakeLists.txt +++ b/source/arch/x86_64/CMakeLists.txt @@ -43,8 +43,6 @@ target_sources("_video" PRIVATE find_package("grub-mkrescue") if(grub-mkrescue_FOUND) - set(ISO_FILE "${PROJECT_BINARY_DIR}/teachos.iso") - file(GENERATE OUTPUT "isofs/boot/grub/grub.cfg" INPUT "support/grub.cfg.in" @@ -53,14 +51,14 @@ if(grub-mkrescue_FOUND) add_custom_target("bootable-iso" COMMAND "${GRUB_MKRESCUE_EXE}" "-o" - "${ISO_FILE}" + "${PROJECT_BINARY_DIR}/teachos-$.iso" "${CMAKE_CURRENT_BINARY_DIR}/isofs" "$" "2>/dev/null" DEPENDS "$" "isofs/boot/grub/grub.cfg" - BYPRODUCTS "${ISO_FILE}" + BYPRODUCTS "${PROJECT_BINARY_DIR}/teachos-$.iso" COMMENT "Creating bootable ISO image" ) endif() -- cgit v1.2.3