Fix linking
KDEUI is dead which caused collateral damage.
This commit is contained in:
parent
209666538e
commit
5ca6654eb8
7 changed files with 19 additions and 5 deletions
|
@ -225,20 +225,30 @@ set(kwin_OWN_LIBS
|
|||
set(kwin_QT_LIBS
|
||||
${Qt5Quick_LIBRARIES}
|
||||
${Qt5X11Extras_LIBRARIES}
|
||||
Qt5::DBus
|
||||
)
|
||||
|
||||
set(kwin_KDE_LIBS
|
||||
${KDE4Support_LIBRARIES}
|
||||
${KDE4_KDEUI_LIBRARY}
|
||||
${KDECLARATIVE_LIBRARIES}
|
||||
KF5::KConfigCore
|
||||
KF5::KCoreAddons
|
||||
KF5::KCrash
|
||||
KF5::KI18n
|
||||
KF5::KIconThemes
|
||||
KF5::KNotifications
|
||||
KF5::KService
|
||||
KF5::plasma
|
||||
KF5::KWindowSystem
|
||||
KF5::XmlGui
|
||||
)
|
||||
|
||||
set(kwin_XLIB_LIBS
|
||||
${X11_X11_LIB}
|
||||
${X11_Xcursor_LIB}
|
||||
${X11_Xext_LIB} # XShapeSelectInput
|
||||
${X11_ICE_LIB}
|
||||
${X11_SM_LIB}
|
||||
)
|
||||
|
||||
set(kwin_XCB_LIBS
|
||||
|
|
|
@ -32,9 +32,10 @@ set(decoration_plugin_SRCS
|
|||
|
||||
add_library(decorationplugin SHARED ${decoration_plugin_SRCS})
|
||||
target_link_libraries(decorationplugin
|
||||
${KDE4_KDEUI_LIBRARY} # KGlobalSettings
|
||||
${KDE4Support_LIBRARIES} # KGlobalSettings
|
||||
${Qt5Declarative_LIBRARIES}
|
||||
kdecorations
|
||||
KF5::KConfigWidgets
|
||||
)
|
||||
install(TARGETS decorationplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kwin/decoration)
|
||||
|
||||
|
|
|
@ -6,6 +6,6 @@ set(plastik_plugin_SRCS
|
|||
qt4_automoc(${plastik_plugin_SRCS})
|
||||
|
||||
add_library(plastikplugin SHARED ${plastik_plugin_SRCS})
|
||||
target_link_libraries(plastikplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBRARY} kdecorations)
|
||||
target_link_libraries(plastikplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} KF5::KConfigWidgets kdecorations)
|
||||
install(TARGETS plastikplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
|
||||
install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
|
||||
|
|
|
@ -4,11 +4,11 @@ set(kwin_effect_OWN_LIBS
|
|||
|
||||
set(kwin_effect_KDE_LIBS
|
||||
${KDE4Support_LIBRARIES}
|
||||
${KDE4_KDEUI_LIBRARY} # KGlobalSettings::dndEventDelay() in PW and DG
|
||||
${KDE4_KDECORE_LIBS} # kdebug
|
||||
KF5::KWindowSystem
|
||||
KF5::plasma # screenedge effect
|
||||
KF5::KDE4Attic # windowgeometry effect using KLocale
|
||||
KF5::KIconThemes
|
||||
)
|
||||
|
||||
set(kwin_effect_QT_LIBS
|
||||
|
@ -94,6 +94,7 @@ macro( KWIN4_ADD_EFFECT_CONFIG name )
|
|||
KF5::KCoreAddons
|
||||
KF5::KConfigWidgets
|
||||
KF5::KI18n
|
||||
KF5::XmlGui
|
||||
)
|
||||
install( TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
endmacro()
|
||||
|
|
|
@ -13,7 +13,6 @@ target_link_libraries(kdecorations
|
|||
${Qt5Widgets_LIBRARIES}
|
||||
${Qt5X11Extras_LIBRARIES}
|
||||
${KDE4Support_LIBRARIES} # kdebug
|
||||
${KDE4_KDEUI_LIBRARY} # KGlobalSettings::windowTitleFont
|
||||
KF5::KConfigCore
|
||||
KF5::KI18n
|
||||
KF5::KService # KLibrary
|
||||
|
|
|
@ -2,7 +2,9 @@ set(kcm_kwin4_genericscripted_SRCS genericscriptedconfig.cpp)
|
|||
kde4_add_plugin( kcm_kwin4_genericscripted ${kcm_kwin4_genericscripted_SRCS} )
|
||||
target_link_libraries( kcm_kwin4_genericscripted
|
||||
KF5::KConfigWidgets #KCModule
|
||||
KF5::KI18n
|
||||
KF5::KService
|
||||
KF5::plasma
|
||||
Qt5::DBus
|
||||
${Qt5UiTools_LIBRARIES} )
|
||||
install( TARGETS kcm_kwin4_genericscripted DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
|
|
@ -34,6 +34,7 @@ target_link_libraries( testVirtualDesktops
|
|||
${Qt5Widgets_LIBRARIES}
|
||||
KF5::KI18n
|
||||
KF5::XmlGui
|
||||
KF5::KWindowSystem
|
||||
)
|
||||
|
||||
########################################################
|
||||
|
|
Loading…
Reference in a new issue