1 files changed, 13 insertions, 16 deletions
diff --git a/kapi/CMakeLists.txt b/kapi/CMakeLists.txt
index 5e914bb..f74cfb3 100644
--- a/kapi/CMakeLists.txt
+++ b/kapi/CMakeLists.txt
@@ -1,34 +1,31 @@
 add_library("kapi" INTERFACE)
-add_library("os::kapi" ALIAS "kapi")
+add_library("kapi::lib" ALIAS "kapi")
+
+file(GLOB_RECURSE KAPI_HEADERS
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    CONFIGURE_DEPENDS
+    "include/**.hpp"
+)
 
 target_sources("kapi" PUBLIC
     FILE_SET HEADERS
     BASE_DIRS "include"
     FILES
-    "include/kapi/boot.hpp"
-    "include/kapi/cio.hpp"
-    "include/kapi/memory.hpp"
-    "include/kapi/memory/address.hpp"
-    "include/kapi/memory/frame_allocator.hpp"
-    "include/kapi/memory/frame.hpp"
-    "include/kapi/memory/page_mapper.hpp"
-    "include/kapi/memory/page.hpp"
-    "include/kapi/system.hpp"
+    ${KAPI_HEADERS}
 )
 
 target_include_directories("kapi" INTERFACE
-    "include"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 target_link_libraries("kapi" INTERFACE
-    "libs::kstd"
+    "acpi::lib"
+    "kstd::lib"
 
     "gcc"
     "stdc++"
 )
 
-target_compile_definitions("kapi" INTERFACE
-    "PLATFORM_PAGE_SIZE=${TEACHOS_PLATFORM_PAGE_SIZE}uz"
-    "PLATFORM_PAGING_LEVELS=${TEACHOS_PLATFORM_PAGING_LEVELS}uz"
-    "PLATFORM_FRAME_SIZE=${TEACHOS_PLATFORM_FRAME_SIZE}uz"
+set_target_properties("kapi" PROPERTIES
+    VERIFY_INTERFACE_HEADER_SETS YES
 )