Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildSystem: Cleanup cmake library linking

This commit is contained in:
Bananymous 2025-05-07 18:30:51 +03:00
parent 3040940e35
commit c18fefd5f3
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -29,12 +29,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# include headers of ${library} to ${target} # include headers of ${library} to ${target}
function(banan_include_headers target library) function(banan_include_headers target library)
target_include_directories(${target} PRIVATE $<TARGET_PROPERTY:${library},SOURCE_DIR>/include) target_include_directories(${target} PUBLIC $<TARGET_PROPERTY:${library},SOURCE_DIR>/include)
endfunction() endfunction()
# include headers and link ${library} to ${target} # include headers and link ${library} to ${target}
function(banan_link_library target library) function(banan_link_library target library)
target_link_libraries(${target} PRIVATE ${library}) target_link_libraries(${target} PUBLIC ${library})
banan_include_headers(${target} ${library}) banan_include_headers(${target} ${library})
endfunction() endfunction()

2
userspace/libraries/LibFont/CMakeLists.txt
View File

@ -4,8 +4,8 @@ set(LIBGUI_SOURCES
) )
add_library(libfont ${LIBGUI_SOURCES}) add_library(libfont ${LIBGUI_SOURCES})
banan_link_library(libfont libc)
banan_link_library(libfont ban) banan_link_library(libfont ban)
banan_link_library(libfont libc)
banan_install_headers(libfont) banan_install_headers(libfont)
install(TARGETS libfont OPTIONAL) install(TARGETS libfont OPTIONAL)

6
userspace/libraries/LibGUI/CMakeLists.txt
View File

@ -4,10 +4,10 @@ set(LIBGUI_SOURCES
) )
add_library(libgui ${LIBGUI_SOURCES}) add_library(libgui ${LIBGUI_SOURCES})
banan_include_headers(libgui ban) banan_link_library(libgui ban)
banan_include_headers(libgui libfont)
banan_include_headers(libgui libinput)
banan_link_library(libgui libc) banan_link_library(libgui libc)
banan_link_library(libgui libfont)
banan_link_library(libgui libinput)
banan_install_headers(libgui) banan_install_headers(libgui)
install(TARGETS libgui OPTIONAL) install(TARGETS libgui OPTIONAL)

2
userspace/libraries/LibImage/CMakeLists.txt
View File

@ -5,8 +5,8 @@ set(LIBIMAGE_SOURCES
) )
add_library(libimage ${LIBIMAGE_SOURCES}) add_library(libimage ${LIBIMAGE_SOURCES})
banan_link_library(libimage libc)
banan_link_library(libimage ban) banan_link_library(libimage ban)
banan_link_library(libimage libc)
banan_install_headers(libimage) banan_install_headers(libimage)
install(TARGETS libimage OPTIONAL) install(TARGETS libimage OPTIONAL)

1
userspace/tests/test-window/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(SOURCES
add_executable(test-window ${SOURCES}) add_executable(test-window ${SOURCES})
banan_include_headers(test-window ban) banan_include_headers(test-window ban)
banan_include_headers(test-window libinput)
banan_link_library(test-window libc) banan_link_library(test-window libc)
banan_link_library(test-window libgui) banan_link_library(test-window libgui)