refactor: replace with INTERFACE, not finished

Signed-off-by: Zone.N <[email protected]>
Simple-XX · Aug 13, 2024 · 6a319b2 · 6a319b2
1 parent 0d55f2b
commit 6a319b2
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -45,7 +45,7 @@
       "cacheVariables": {
         "CMAKE_VERBOSE_MAKEFILE": {
           "type": "BOOL",
-          "value": "FALSE"
+          "value": "TRUE"
         },
         "CMAKE_EXPORT_COMPILE_COMMANDS": {
           "type": "BOOL",

diff --git a/cmake/compile_config.cmake b/cmake/compile_config.cmake
@@ -202,6 +202,7 @@ target_link_options(DEFAULT_KERNEL_LINK_OPTIONS INTERFACE
 add_library(DEFAULT_KERNEL_LINK_LIB INTERFACE)
 target_link_libraries(DEFAULT_KERNEL_LINK_LIB INTERFACE
         COMMON_LINK_LIB
+        DEFAULT_KERNEL_LINK_OPTIONS
 
         printf_bare_metal
         ${dtc_BINARY_DIR}/libfdt/libfdt.a

diff --git a/src/boot/CMakeLists.txt b/src/boot/CMakeLists.txt
@@ -26,7 +26,7 @@ add_header_3rd(${PROJECT_NAME})
 
 # 添加要链接的库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_BOOT_LINK_LIB}
+        DEFAULT_BOOT_LINK_LIB
 )
 
 # 添加依赖

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_options(${PROJECT_NAME} PRIVATE
 
 # 添加要链接的库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
         libc
         libcxx
         arch

diff --git a/src/kernel/arch/CMakeLists.txt b/src/kernel/arch/CMakeLists.txt
@@ -48,5 +48,5 @@ target_link_options(${PROJECT_NAME} PRIVATE
 
 # 添加要链接的库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
 )
diff --git a/src/kernel/libc/CMakeLists.txt b/src/kernel/libc/CMakeLists.txt
@@ -39,5 +39,5 @@ target_link_options(${PROJECT_NAME} PRIVATE
 
 # 添加要链接的库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
 )
diff --git a/src/kernel/libcxx/CMakeLists.txt b/src/kernel/libcxx/CMakeLists.txt
@@ -40,5 +40,5 @@ target_link_options(${PROJECT_NAME} PRIVATE
 
 # 添加要链接的库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
 )
diff --git a/test/system_test/cxx_init_test/CMakeLists.txt b/test/system_test/cxx_init_test/CMakeLists.txt
@@ -35,7 +35,7 @@ target_link_options(${PROJECT_NAME} PRIVATE
 )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
         libc
         libcxx
 )

diff --git a/test/system_test/gnu_efi_test/CMakeLists.txt b/test/system_test/gnu_efi_test/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_options(${PROJECT_NAME} PRIVATE
 )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
         libc
         libcxx
 )

diff --git a/test/system_test/opensbi_test/CMakeLists.txt b/test/system_test/opensbi_test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_options(${PROJECT_NAME} PRIVATE
 
 # 添加要链接的库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${DEFAULT_KERNEL_LINK_LIB}
+        DEFAULT_KERNEL_LINK_LIB
         libc
         libcxx
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ target_link_options(${PROJECT_NAME} PRIVATE @@
     )
     target_link_libraries(${PROJECT_NAME} PRIVATE
-            ${DEFAULT_KERNEL_LINK_LIB}
+            DEFAULT_KERNEL_LINK_LIB
             libc
             libcxx
     )
@@ Expand Down @@