light7734/light
light7734/light
1
1
Fork 0
Code Issues 19 Pull requests 3 Projects 1 Releases Packages Wiki Activity

fix: forgot to stage this
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse source
This commit is contained in:
light7734 2025-10-05 10:07:48 +03:30
parent d506d6a6a7
commit 68c49ebdfb
Signed by: light7734
GPG key ID: 8C30176798F1A6BA
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/cmake/functions.cmake
View file

@ -12,10 +12,7 @@ function (add_library_module libname)
add_library(${libname} INTERFACE) add_library(${libname} INTERFACE)
target_include_directories(${libname} INTERFACE ${PUBLIC_INCLUDE_DIR}) target_include_directories(${libname} INTERFACE ${PUBLIC_INCLUDE_DIR})
# Do not link base against base :D target_link_libraries(${libname} INTERFACE std)
if (NOT ${libname} STREQUAL "base")
target_link_libraries(${libname} INTERFACE base)
endif ()
else () # Compiled library else () # Compiled library
set(source_files) set(source_files)
@ -40,11 +37,9 @@ function (add_library_module libname)
PRIVATE ${PRIVATE_INCLUDE_DIR} PRIVATE ${PRIVATE_INCLUDE_DIR}
) )
# Do not link base against base :D target_link_libraries(${libname} PUBLIC std)
if (NOT ${libname} STREQUAL "base")
target_link_libraries(${libname} PUBLIC base)
endif ()
endif () endif ()
endfunction () endfunction ()
function (add_executable_module exename) function (add_executable_module exename)
@ -72,7 +67,7 @@ function (add_executable_module exename)
) )
add_executable(${exename} ${source_files}) add_executable(${exename} ${source_files})
target_link_libraries(${exename} PRIVATE base) target_link_libraries(${exename} PRIVATE std)
target_include_directories(${exename} PRIVATE ${PUBLIC_INCLUDE_DIR} ${PRIVATE_INCLUDE_DIR}) target_include_directories(${exename} PRIVATE ${PUBLIC_INCLUDE_DIR} ${PRIVATE_INCLUDE_DIR})
endfunction () endfunction ()
@ -105,7 +100,7 @@ function (add_test_module target_lib_name)
) )
add_executable(${target_lib_name}_tests ${source_files}) add_executable(${target_lib_name}_tests ${source_files})
target_link_libraries(${target_lib_name}_tests PRIVATE ${target_lib_name} base test) target_link_libraries(${target_lib_name}_tests PRIVATE ${target_lib_name} std test)
target_include_directories(${target_lib_name}_tests target_include_directories(${target_lib_name}_tests
PRIVATE ${PUBLIC_INCLUDE_DIR} PRIVATE ${PUBLIC_INCLUDE_DIR}
PRIVATE ${PRIVATE_INCLUDE_DIR} PRIVATE ${PRIVATE_INCLUDE_DIR}
@ -141,7 +136,7 @@ function (add_fuzz_module target_lib_name)
) )
add_executable(${target_lib_name}_fuzz ${source_files}) add_executable(${target_lib_name}_fuzz ${source_files})
target_link_libraries(${target_lib_name}_fuzz PRIVATE ${target_lib_name} base fuzz_test) target_link_libraries(${target_lib_name}_fuzz PRIVATE ${target_lib_name} std fuzz_test)
target_link_options(${target_lib_name}_fuzz PRIVATE -fsanitize=fuzzer) target_link_options(${target_lib_name}_fuzz PRIVATE -fsanitize=fuzzer)
target_compile_options(${target_lib_name}_fuzz PRIVATE -fsanitize=fuzzer) target_compile_options(${target_lib_name}_fuzz PRIVATE -fsanitize=fuzzer)
target_include_directories(${target_lib_name}_fuzz target_include_directories(${target_lib_name}_fuzz