File tree Expand file tree Collapse file tree 6 files changed +16
-4
lines changed Expand file tree Collapse file tree 6 files changed +16
-4
lines changed Original file line number Diff line number Diff line change 1+ # Adds a dependency hint to the link order, but does not block build on the dependency.
2+ function (qs_add_link_dependencies target )
3+ set_property (
4+ TARGET ${target}
5+ APPEND PROPERTY INTERFACE_LINK_LIBRARIES
6+ ${ARGN}
7+ )
8+ endfunction ()
9+
110function (qs_append_qmldir target text)
211 get_property (qmldir_content TARGET ${target} PROPERTY _qt_internal_qmldir_content)
312
Original file line number Diff line number Diff line change @@ -2,8 +2,8 @@ qt_add_executable(quickshell main.cpp)
22
33install (TARGETS quickshell RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
44
5- add_subdirectory (launch)
65add_subdirectory (build )
6+ add_subdirectory (launch)
77add_subdirectory (core)
88add_subdirectory (ipc)
99add_subdirectory (window)
Original file line number Diff line number Diff line change @@ -14,4 +14,4 @@ target_link_libraries(quickshell-crash PRIVATE PkgConfig::breakpad -lbreakpad_cl
1414# quick linked for pch compat
1515target_link_libraries (quickshell-crash PRIVATE quickshell-build Qt::Quick Qt::Widgets)
1616
17- target_link_libraries (quickshell-core PRIVATE quickshell-crash)
17+ target_link_libraries (quickshell PRIVATE quickshell-crash)
Original file line number Diff line number Diff line change @@ -27,7 +27,8 @@ install_qml_module(quickshell-dbusmenu)
2727# dbus headers
2828target_include_directories (quickshell-dbusmenu PRIVATE ${CMAKE_CURRENT_BINARY_DIR} )
2929
30- target_link_libraries (quickshell-dbusmenu PRIVATE Qt::Quick Qt::DBus quickshell-dbus)
30+ target_link_libraries (quickshell-dbusmenu PRIVATE Qt::Quick Qt::DBus)
31+ qs_add_link_dependencies(quickshell-dbusmenu quickshell-dbus)
3132
3233qs_module_pch(quickshell-dbusmenu SET dbus)
3334
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ qs_add_module_deps_light(quickshell-service-mpris Quickshell)
3838install_qml_module(quickshell-service-mpris)
3939
4040target_link_libraries (quickshell-service-mpris PRIVATE Qt::Qml Qt::DBus)
41+ qs_add_link_dependencies(quickshell-service-mpris quickshell-dbus)
4142
4243qs_module_pch(quickshell-service-mpris SET dbus)
4344
Original file line number Diff line number Diff line change @@ -37,7 +37,8 @@ qs_add_module_deps_light(quickshell-service-upower Quickshell)
3737
3838install_qml_module(quickshell-service-upower)
3939
40- target_link_libraries (quickshell-service-upower PRIVATE Qt::Qml Qt::DBus quickshell-dbus)
40+ target_link_libraries (quickshell-service-upower PRIVATE Qt::Qml Qt::DBus)
41+ qs_add_link_dependencies(quickshell-service-upower quickshell-dbus)
4142target_link_libraries (quickshell PRIVATE quickshell-service-upowerplugin)
4243
4344qs_module_pch(quickshell-service-upower SET dbus)
You can’t perform that action at this time.
0 commit comments