1
0
Fork 0

Rework Qt 5 private modules linking

This commit is contained in:
Ilya Fedin 2022-08-04 07:12:34 +04:00 committed by John Preston
parent d8442d4d96
commit 3eb3165734

View file

@ -17,37 +17,34 @@ if (DESKTOP_APP_USE_PACKAGED)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
Qt5::Core Qt5::Core
Qt5::CorePrivate
Qt5::Gui Qt5::Gui
Qt5::GuiPrivate
Qt5::Widgets Qt5::Widgets
Qt5::Network Qt5::Network
Qt5::Svg Qt5::Svg
) )
target_include_directories(external_qt SYSTEM
INTERFACE
${Qt5Core_PRIVATE_INCLUDE_DIRS}
${Qt5Gui_PRIVATE_INCLUDE_DIRS}
)
if (Qt5DBus_FOUND) if (Qt5DBus_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::DBus) target_link_libraries(external_qt
INTERFACE
Qt5::DBus
)
endif() endif()
if (Qt5XkbCommonSupport_FOUND) if (Qt5XkbCommonSupport_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport) target_link_libraries(external_qt
target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS} Qt5::XkbCommonSupport
Qt5::XkbCommonSupportPrivate
) )
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) target_link_libraries(external_qt
target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} Qt5::WaylandClient
Qt5::WaylandClientPrivate
) )
endif() endif()