diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/kernel/arch/x86_64/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 0ae9e40..3fa076c 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -7,5 +7,7 @@ project("kernel" LANGUAGES ASM C CXX ) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") + add_subdirectory("boot") add_subdirectory("kernel") diff --git a/source/kernel/arch/x86_64/CMakeLists.txt b/source/kernel/arch/x86_64/CMakeLists.txt index 303ae1f..99fafe7 100644 --- a/source/kernel/arch/x86_64/CMakeLists.txt +++ b/source/kernel/arch/x86_64/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties("kernel" PROPERTIES find_package("grub-mkrescue") if(grub-mkrescue_FOUND) - set(ISO_FILE "${PROJECT_BINARY_DIR}/teachos-${PROJECT_VERSION}.iso") + set(ISO_FILE "${PROJECT_BINARY_DIR}/teachos.iso") file(GENERATE OUTPUT "isofs/boot/grub/grub.cfg" @@ -48,7 +48,7 @@ if(grub-mkrescue_FOUND) "${CMAKE_CURRENT_BINARY_DIR}/isofs" "$<TARGET_FILE:kernel>" "2>/dev/null" - SOURCES + DEPENDS "$<TARGET_FILE:kernel>" "isofs/boot/grub/grub.cfg" BYPRODUCTS "${ISO_FILE}" |