diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | arch/x86_64/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | kapi/CMakeLists.txt | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64fb08f..3251847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,8 @@ add_executable("kernel" ) target_link_libraries("kernel" PRIVATE - "arch::${CMAKE_SYSTEM_PROCESSOR}" - "api::kapi" + "os::arch" + "os::kapi" ) target_link_options("kernel" PRIVATE diff --git a/arch/x86_64/CMakeLists.txt b/arch/x86_64/CMakeLists.txt index 1cb2f9a..ddc2d46 100644 --- a/arch/x86_64/CMakeLists.txt +++ b/arch/x86_64/CMakeLists.txt @@ -1,16 +1,16 @@ -add_library("arch-x86_64" OBJECT) -add_library("arch::x86_64" ALIAS "arch-x86_64") +add_library("x86_64" OBJECT) +add_library("os::arch" ALIAS "x86_64") -target_include_directories("arch-x86_64" PUBLIC +target_include_directories("x86_64" PUBLIC "include" ) -target_link_libraries("arch-x86_64" PUBLIC - "api::kapi" +target_link_libraries("x86_64" PUBLIC + "os::kapi" "libs::multiboot2" ) -target_sources("arch-x86_64" PRIVATE +target_sources("x86_64" PRIVATE # api::kapi implementation "kapi/io.cpp" "kapi/memory.cpp" diff --git a/kapi/CMakeLists.txt b/kapi/CMakeLists.txt index a3cd040..3a15fee 100644 --- a/kapi/CMakeLists.txt +++ b/kapi/CMakeLists.txt @@ -1,5 +1,5 @@ add_library("kapi" OBJECT) -add_library("api::kapi" ALIAS "kapi") +add_library("os::kapi" ALIAS "kapi") target_sources("kapi" PUBLIC FILE_SET HEADERS |