build: simplify link for platform library

Add Public and Private links, simplify needed libs for general unix
This commit is contained in:
sithlord48 2026-08-04 08:54:58 -04:00 committed by Nick Bolton
parent 9da4b5cb87
commit 86a970a90a

View file

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com> # SPDX-FileCopyrightText: (C) 2024 - 2026 Chris Rizzitello <sithlord48@gmail.com>
# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd # SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton # SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
@ -173,20 +173,14 @@ endif()
# wayland.h is included to check for wayland support # wayland.h is included to check for wayland support
add_library(platform STATIC ${PLATFORM_SOURCES}) add_library(platform STATIC ${PLATFORM_SOURCES})
target_link_libraries(platform client ${libs}) target_link_libraries(platform PUBLIC client ${libs})
if(UNIX) if(UNIX)
target_link_libraries( target_link_libraries(platform PRIVATE net app)
platform
io
net
app
client
${libs})
if(APPLE) if(APPLE)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
target_link_libraries(platform ${COCOA_LIBRARY}) target_link_libraries(platform PUBLIC ${COCOA_LIBRARY})
else() else()
if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10") if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10")
target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1) target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1)
@ -199,11 +193,12 @@ if(UNIX)
target_compile_definitions(platform PUBLIC HAVE_LIBPORTAL_CLIPBOARD) target_compile_definitions(platform PUBLIC HAVE_LIBPORTAL_CLIPBOARD)
endif() endif()
target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS}) target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS})
target_link_libraries( target_link_libraries(platform
platform PUBLIC
Qt6::DBus Qt6::DBus
Qt6::Gui PRIVATE
${LIBXKBCOMMON_LINK_LIBRARIES} Qt6::Gui
${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES}) ${LIBXKBCOMMON_LINK_LIBRARIES}
${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES})
endif() endif()
endif() endif()