Skip to content

Commit 34b68fb

Browse files
committed
refactor: replace with INTERFACE, arch
Signed-off-by: Zone.N <zone.niuzh@hotmail.com>
1 parent 5d9d62e commit 34b68fb

File tree

6 files changed

+5
-8
lines changed

6 files changed

+5
-8
lines changed

cmake/add_header.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ function(add_header_libcxx _target)
2525
${CMAKE_SOURCE_DIR}/src/kernel/libcxx/include)
2626
endfunction()
2727

28-
function(add_header_arch _target)
29-
endfunction()
30-
3128
function(add_header_kernel _target)
3229
target_include_directories(${_target} PRIVATE
3330
${CMAKE_SOURCE_DIR}/src/kernel/include)

src/kernel/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ add_executable(${PROJECT_NAME}
2626
# 添加头文件
2727
add_header_libc(${PROJECT_NAME})
2828
add_header_libcxx(${PROJECT_NAME})
29-
add_header_arch(${PROJECT_NAME})
3029
add_header_kernel(${PROJECT_NAME})
3130
add_header_driver(${PROJECT_NAME})
3231
add_header_3rd(${PROJECT_NAME})

test/system_test/cxx_init_test/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ add_executable(${PROJECT_NAME}
2323

2424
add_header_libc(${PROJECT_NAME})
2525
add_header_libcxx(${PROJECT_NAME})
26-
add_header_arch(${PROJECT_NAME})
2726
add_header_kernel(${PROJECT_NAME})
2827

28+
target_include_directories(${PROJECT_NAME} PRIVATE
29+
${CMAKE_SOURCE_DIR}/src/kernel/arch
30+
${CMAKE_SOURCE_DIR}/src/kernel/arch/${CMAKE_SYSTEM_PROCESSOR}/include
31+
)
32+
2933
target_compile_options(${PROJECT_NAME} PRIVATE
3034
${DEFAULT_KERNEL_COMPILE_OPTIONS}
3135
)

test/system_test/gnu_efi_test/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ add_executable(${PROJECT_NAME}
1818

1919
add_header_libc(${PROJECT_NAME})
2020
add_header_libcxx(${PROJECT_NAME})
21-
add_header_arch(${PROJECT_NAME})
2221
add_header_kernel(${PROJECT_NAME})
2322

2423
target_compile_options(${PROJECT_NAME} PRIVATE

test/system_test/opensbi_test/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ add_executable(${PROJECT_NAME}
2020

2121
add_header_libc(${PROJECT_NAME})
2222
add_header_libcxx(${PROJECT_NAME})
23-
add_header_arch(${PROJECT_NAME})
2423
add_header_kernel(${PROJECT_NAME})
2524
add_header_3rd(${PROJECT_NAME})
2625

test/unit_test/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ add_executable(${PROJECT_NAME}
2020
kernel_fdt_test.cpp
2121
)
2222

23-
add_header_arch(${PROJECT_NAME})
2423
add_header_kernel(${PROJECT_NAME})
2524
add_header_3rd(${PROJECT_NAME})
2625
add_header_libc(${PROJECT_NAME})

0 commit comments

Comments
 (0)