diff --git a/CMakeLists.txt b/CMakeLists.txt index 539fae38..8d6a35bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,12 +29,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # include headers of ${library} to ${target} function(banan_include_headers target library) - target_include_directories(${target} PRIVATE $/include) + target_include_directories(${target} PUBLIC $/include) endfunction() # include headers and link ${library} to ${target} function(banan_link_library target library) - target_link_libraries(${target} PRIVATE ${library}) + target_link_libraries(${target} PUBLIC ${library}) banan_include_headers(${target} ${library}) endfunction() diff --git a/userspace/libraries/LibFont/CMakeLists.txt b/userspace/libraries/LibFont/CMakeLists.txt index 390eed3a..5ee4c3df 100644 --- a/userspace/libraries/LibFont/CMakeLists.txt +++ b/userspace/libraries/LibFont/CMakeLists.txt @@ -4,8 +4,8 @@ set(LIBGUI_SOURCES ) add_library(libfont ${LIBGUI_SOURCES}) -banan_link_library(libfont libc) banan_link_library(libfont ban) +banan_link_library(libfont libc) banan_install_headers(libfont) install(TARGETS libfont OPTIONAL) diff --git a/userspace/libraries/LibGUI/CMakeLists.txt b/userspace/libraries/LibGUI/CMakeLists.txt index cb7d4749..361b17f3 100644 --- a/userspace/libraries/LibGUI/CMakeLists.txt +++ b/userspace/libraries/LibGUI/CMakeLists.txt @@ -4,10 +4,10 @@ set(LIBGUI_SOURCES ) add_library(libgui ${LIBGUI_SOURCES}) -banan_include_headers(libgui ban) -banan_include_headers(libgui libfont) -banan_include_headers(libgui libinput) +banan_link_library(libgui ban) banan_link_library(libgui libc) +banan_link_library(libgui libfont) +banan_link_library(libgui libinput) banan_install_headers(libgui) install(TARGETS libgui OPTIONAL) diff --git a/userspace/libraries/LibImage/CMakeLists.txt b/userspace/libraries/LibImage/CMakeLists.txt index 4fcddaf0..b6df7088 100644 --- a/userspace/libraries/LibImage/CMakeLists.txt +++ b/userspace/libraries/LibImage/CMakeLists.txt @@ -5,8 +5,8 @@ set(LIBIMAGE_SOURCES ) add_library(libimage ${LIBIMAGE_SOURCES}) -banan_link_library(libimage libc) banan_link_library(libimage ban) +banan_link_library(libimage libc) banan_install_headers(libimage) install(TARGETS libimage OPTIONAL) diff --git a/userspace/tests/test-window/CMakeLists.txt b/userspace/tests/test-window/CMakeLists.txt index 94b5205e..1771a2d8 100644 --- a/userspace/tests/test-window/CMakeLists.txt +++ b/userspace/tests/test-window/CMakeLists.txt @@ -4,7 +4,6 @@ set(SOURCES add_executable(test-window ${SOURCES}) banan_include_headers(test-window ban) -banan_include_headers(test-window libinput) banan_link_library(test-window libc) banan_link_library(test-window libgui)