diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2023-10-12 11:11:41 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2023-10-12 11:11:41 +0200 |
| commit | 12785240ca92bb623e1f836b4c81238d875198cd (patch) | |
| tree | f753312ff416e5c21575eae9ff0069b1cfa30bdc /source | |
| parent | b9ff63ee60c1316573190eaf757a12b8d1b83f9c (diff) | |
| download | teachos-12785240ca92bb623e1f836b4c81238d875198cd.tar.xz teachos-12785240ca92bb623e1f836b4c81238d875198cd.zip | |
build: switch to ninja multi-config generator
Diffstat (limited to 'source')
| -rw-r--r-- | source/arch/x86_64/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
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-$<CONFIGURATION>.iso" "${CMAKE_CURRENT_BINARY_DIR}/isofs" "$<TARGET_FILE:teachos::kernel>" "2>/dev/null" DEPENDS "$<TARGET_FILE:teachos::kernel>" "isofs/boot/grub/grub.cfg" - BYPRODUCTS "${ISO_FILE}" + BYPRODUCTS "${PROJECT_BINARY_DIR}/teachos-$<CONFIGURATION>.iso" COMMENT "Creating bootable ISO image" ) endif() |