Undo some recent cmake changes
Unfortunately linking can be very fragile so let's not break things.
This commit is contained in:
parent
265e6367f7
commit
09b47b5250
15 changed files with 105 additions and 60 deletions
|
@ -561,8 +561,8 @@ ki18n_wrap_ui(kwin_KDEINIT_SRCS
|
||||||
########### target link libraries ###############
|
########### target link libraries ###############
|
||||||
|
|
||||||
set(kwin_OWN_LIBS
|
set(kwin_OWN_LIBS
|
||||||
kwin4_effect_builtins
|
|
||||||
kwineffects
|
kwineffects
|
||||||
|
kwin4_effect_builtins
|
||||||
)
|
)
|
||||||
|
|
||||||
set(kwin_QT_LIBS
|
set(kwin_QT_LIBS
|
||||||
|
@ -574,8 +574,6 @@ set(kwin_QT_LIBS
|
||||||
)
|
)
|
||||||
|
|
||||||
set(kwin_KDE_LIBS
|
set(kwin_KDE_LIBS
|
||||||
KDecoration2::KDecoration
|
|
||||||
KDecoration2::KDecoration2Private
|
|
||||||
KF5::ConfigCore
|
KF5::ConfigCore
|
||||||
KF5::ConfigWidgets
|
KF5::ConfigWidgets
|
||||||
KF5::CoreAddons
|
KF5::CoreAddons
|
||||||
|
@ -587,6 +585,10 @@ set(kwin_KDE_LIBS
|
||||||
KF5::Plasma
|
KF5::Plasma
|
||||||
KF5::QuickAddons
|
KF5::QuickAddons
|
||||||
KF5::WindowSystem
|
KF5::WindowSystem
|
||||||
|
|
||||||
|
KDecoration2::KDecoration
|
||||||
|
KDecoration2::KDecoration2Private
|
||||||
|
|
||||||
PW::KScreenLocker
|
PW::KScreenLocker
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -37,13 +37,14 @@ set(testVirtualDesktops_SRCS
|
||||||
add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
|
add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
|
||||||
|
|
||||||
target_link_libraries(testVirtualDesktops
|
target_link_libraries(testVirtualDesktops
|
||||||
|
Qt5::Test
|
||||||
|
Qt5::Widgets
|
||||||
|
|
||||||
KF5::ConfigCore
|
KF5::ConfigCore
|
||||||
KF5::GlobalAccel
|
KF5::GlobalAccel
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
KF5::WaylandServer
|
KF5::WaylandServer
|
||||||
KF5::WindowSystem
|
KF5::WindowSystem
|
||||||
Qt5::Test
|
|
||||||
Qt5::Widgets
|
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testVirtualDesktops COMMAND testVirtualDesktops)
|
add_test(NAME kwin-testVirtualDesktops COMMAND testVirtualDesktops)
|
||||||
ecm_mark_as_test(testVirtualDesktops)
|
ecm_mark_as_test(testVirtualDesktops)
|
||||||
|
@ -59,15 +60,18 @@ add_executable(testClientMachine ${testClientMachine_SRCS})
|
||||||
set_target_properties(testClientMachine PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
set_target_properties(testClientMachine PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
||||||
|
|
||||||
target_link_libraries(testClientMachine
|
target_link_libraries(testClientMachine
|
||||||
${X11_X11_LIB} # to make jenkins happy
|
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Concurrent
|
Qt5::Concurrent
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
XCB::XFIXES
|
XCB::XFIXES
|
||||||
|
|
||||||
|
${X11_X11_LIB} # to make jenkins happy
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testClientMachine COMMAND testClientMachine)
|
add_test(NAME kwin-testClientMachine COMMAND testClientMachine)
|
||||||
ecm_mark_as_test(testClientMachine)
|
ecm_mark_as_test(testClientMachine)
|
||||||
|
@ -81,11 +85,13 @@ set(testXcbWrapper_SRCS
|
||||||
add_executable(testXcbWrapper ${testXcbWrapper_SRCS})
|
add_executable(testXcbWrapper ${testXcbWrapper_SRCS})
|
||||||
|
|
||||||
target_link_libraries(testXcbWrapper
|
target_link_libraries(testXcbWrapper
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testXcbWrapper COMMAND testXcbWrapper)
|
add_test(NAME kwin-testXcbWrapper COMMAND testXcbWrapper)
|
||||||
|
@ -95,11 +101,13 @@ if (XCB_ICCCM_FOUND)
|
||||||
add_executable(testXcbSizeHints test_xcb_size_hints.cpp)
|
add_executable(testXcbSizeHints test_xcb_size_hints.cpp)
|
||||||
set_target_properties(testXcbSizeHints PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
set_target_properties(testXcbSizeHints PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
||||||
target_link_libraries(testXcbSizeHints
|
target_link_libraries(testXcbSizeHints
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XCB::ICCCM
|
XCB::ICCCM
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
)
|
)
|
||||||
|
@ -116,11 +124,13 @@ set(testXcbWindow_SRCS
|
||||||
add_executable(testXcbWindow ${testXcbWindow_SRCS})
|
add_executable(testXcbWindow ${testXcbWindow_SRCS})
|
||||||
|
|
||||||
target_link_libraries(testXcbWindow
|
target_link_libraries(testXcbWindow
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testXcbWindow COMMAND testXcbWindow)
|
add_test(NAME kwin-testXcbWindow COMMAND testXcbWindow)
|
||||||
|
@ -138,12 +148,14 @@ add_executable(testBuiltInEffectLoader ${testBuiltInEffectLoader_SRCS})
|
||||||
set_target_properties(testBuiltInEffectLoader PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
set_target_properties(testBuiltInEffectLoader PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
||||||
|
|
||||||
target_link_libraries(testBuiltInEffectLoader
|
target_link_libraries(testBuiltInEffectLoader
|
||||||
KF5::Package
|
|
||||||
Qt5::Concurrent
|
Qt5::Concurrent
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
kwin4_effect_builtins
|
|
||||||
|
KF5::Package
|
||||||
|
|
||||||
kwineffects
|
kwineffects
|
||||||
|
kwin4_effect_builtins
|
||||||
)
|
)
|
||||||
|
|
||||||
add_test(NAME kwin-testBuiltInEffectLoader COMMAND testBuiltInEffectLoader)
|
add_test(NAME kwin-testBuiltInEffectLoader COMMAND testBuiltInEffectLoader)
|
||||||
|
@ -171,19 +183,21 @@ qt5_add_dbus_adaptor(testScriptedEffectLoader_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/.
|
||||||
add_executable(testScriptedEffectLoader ${testScriptedEffectLoader_SRCS})
|
add_executable(testScriptedEffectLoader ${testScriptedEffectLoader_SRCS})
|
||||||
|
|
||||||
target_link_libraries(testScriptedEffectLoader
|
target_link_libraries(testScriptedEffectLoader
|
||||||
KF5::ConfigGui
|
|
||||||
KF5::GlobalAccel
|
|
||||||
KF5::I18n
|
|
||||||
KF5::Notifications
|
|
||||||
KF5::Package
|
|
||||||
Qt5::Concurrent
|
Qt5::Concurrent
|
||||||
Qt5::Qml
|
Qt5::Qml
|
||||||
Qt5::Script
|
Qt5::Script
|
||||||
Qt5::Sensors
|
Qt5::Sensors
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
kwin4_effect_builtins
|
|
||||||
|
KF5::ConfigGui
|
||||||
|
KF5::GlobalAccel
|
||||||
|
KF5::I18n
|
||||||
|
KF5::Notifications
|
||||||
|
KF5::Package
|
||||||
|
|
||||||
kwineffects
|
kwineffects
|
||||||
|
kwin4_effect_builtins
|
||||||
)
|
)
|
||||||
|
|
||||||
add_test(NAME kwin-testScriptedEffectLoader COMMAND testScriptedEffectLoader)
|
add_test(NAME kwin-testScriptedEffectLoader COMMAND testScriptedEffectLoader)
|
||||||
|
@ -200,12 +214,14 @@ set(testPluginEffectLoader_SRCS
|
||||||
add_executable(testPluginEffectLoader ${testPluginEffectLoader_SRCS})
|
add_executable(testPluginEffectLoader ${testPluginEffectLoader_SRCS})
|
||||||
|
|
||||||
target_link_libraries(testPluginEffectLoader
|
target_link_libraries(testPluginEffectLoader
|
||||||
KF5::Package
|
|
||||||
Qt5::Concurrent
|
Qt5::Concurrent
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
kwin4_effect_builtins
|
|
||||||
|
KF5::Package
|
||||||
|
|
||||||
kwineffects
|
kwineffects
|
||||||
|
kwin4_effect_builtins
|
||||||
)
|
)
|
||||||
|
|
||||||
add_test(NAME kwin-testPluginEffectLoader COMMAND testPluginEffectLoader)
|
add_test(NAME kwin-testPluginEffectLoader COMMAND testPluginEffectLoader)
|
||||||
|
@ -244,16 +260,17 @@ qt5_add_dbus_adaptor(testScreens_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.kwi
|
||||||
add_executable(testScreens ${testScreens_SRCS})
|
add_executable(testScreens ${testScreens_SRCS})
|
||||||
target_include_directories(testScreens BEFORE PRIVATE ./)
|
target_include_directories(testScreens BEFORE PRIVATE ./)
|
||||||
target_link_libraries(testScreens
|
target_link_libraries(testScreens
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::ConfigGui
|
|
||||||
KF5::I18n
|
|
||||||
KF5::Notifications
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::DBus
|
Qt5::DBus
|
||||||
Qt5::Sensors
|
Qt5::Sensors
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::ConfigGui
|
||||||
|
KF5::I18n
|
||||||
|
KF5::Notifications
|
||||||
|
KF5::WindowSystem
|
||||||
)
|
)
|
||||||
|
|
||||||
add_test(NAME kwin_testScreens COMMAND testScreens)
|
add_test(NAME kwin_testScreens COMMAND testScreens)
|
||||||
|
@ -285,6 +302,11 @@ add_executable(testScreenEdges ${testScreenEdges_SRCS})
|
||||||
set_target_properties(testScreenEdges PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
set_target_properties(testScreenEdges PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
||||||
target_include_directories(testScreenEdges BEFORE PRIVATE ./)
|
target_include_directories(testScreenEdges BEFORE PRIVATE ./)
|
||||||
target_link_libraries(testScreenEdges
|
target_link_libraries(testScreenEdges
|
||||||
|
Qt5::DBus
|
||||||
|
Qt5::Sensors
|
||||||
|
Qt5::Test
|
||||||
|
Qt5::X11Extras
|
||||||
|
|
||||||
KF5::ConfigCore
|
KF5::ConfigCore
|
||||||
KF5::ConfigGui
|
KF5::ConfigGui
|
||||||
KF5::GlobalAccel
|
KF5::GlobalAccel
|
||||||
|
@ -292,10 +314,7 @@ target_link_libraries(testScreenEdges
|
||||||
KF5::Notifications
|
KF5::Notifications
|
||||||
KF5::WaylandServer
|
KF5::WaylandServer
|
||||||
KF5::WindowSystem
|
KF5::WindowSystem
|
||||||
Qt5::DBus
|
|
||||||
Qt5::Sensors
|
|
||||||
Qt5::Test
|
|
||||||
Qt5::X11Extras
|
|
||||||
XCB::COMPOSITE
|
XCB::COMPOSITE
|
||||||
XCB::DAMAGE
|
XCB::DAMAGE
|
||||||
XCB::GLX
|
XCB::GLX
|
||||||
|
@ -320,11 +339,12 @@ set(testOnScreenNotification_SRCS
|
||||||
add_executable(testOnScreenNotification ${testOnScreenNotification_SRCS})
|
add_executable(testOnScreenNotification ${testOnScreenNotification_SRCS})
|
||||||
|
|
||||||
target_link_libraries(testOnScreenNotification
|
target_link_libraries(testOnScreenNotification
|
||||||
KF5::ConfigCore
|
|
||||||
Qt5::DBus
|
Qt5::DBus
|
||||||
Qt5::Quick
|
Qt5::Quick
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets # QAction include
|
Qt5::Widgets # QAction include
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
)
|
)
|
||||||
|
|
||||||
add_test(NAME kwin-testOnScreenNotification COMMAND testOnScreenNotification)
|
add_test(NAME kwin-testOnScreenNotification COMMAND testOnScreenNotification)
|
||||||
|
@ -378,12 +398,14 @@ set(testXkb_SRCS
|
||||||
)
|
)
|
||||||
add_executable(testXkb ${testXkb_SRCS})
|
add_executable(testXkb ${testXkb_SRCS})
|
||||||
target_link_libraries(testXkb
|
target_link_libraries(testXkb
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::WaylandServer
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Gui
|
Qt5::Gui
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::WaylandServer
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XKB::XKB
|
XKB::XKB
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testXkb COMMAND testXkb)
|
add_test(NAME kwin-testXkb COMMAND testXkb)
|
||||||
|
|
|
@ -94,11 +94,12 @@ set(testLibinputContext_SRCS
|
||||||
)
|
)
|
||||||
add_executable(testLibinputContext ${testLibinputContext_SRCS})
|
add_executable(testLibinputContext ${testLibinputContext_SRCS})
|
||||||
target_link_libraries(testLibinputContext
|
target_link_libraries(testLibinputContext
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::DBus
|
Qt5::DBus
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::WindowSystem
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testLibinputContext COMMAND testLibinputContext)
|
add_test(NAME kwin-testLibinputContext COMMAND testLibinputContext)
|
||||||
ecm_mark_as_test(testLibinputContext)
|
ecm_mark_as_test(testLibinputContext)
|
||||||
|
|
|
@ -17,10 +17,6 @@ set(testTabBoxClientModel_SRCS
|
||||||
add_executable(testTabBoxClientModel ${testTabBoxClientModel_SRCS})
|
add_executable(testTabBoxClientModel ${testTabBoxClientModel_SRCS})
|
||||||
set_target_properties(testTabBoxClientModel PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
set_target_properties(testTabBoxClientModel PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
||||||
target_link_libraries(testTabBoxClientModel
|
target_link_libraries(testTabBoxClientModel
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::I18n
|
|
||||||
KF5::Package
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Core
|
Qt5::Core
|
||||||
Qt5::DBus
|
Qt5::DBus
|
||||||
Qt5::Quick
|
Qt5::Quick
|
||||||
|
@ -28,6 +24,12 @@ target_link_libraries(testTabBoxClientModel
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::I18n
|
||||||
|
KF5::Package
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testTabBoxClientModel COMMAND testTabBoxClientModel)
|
add_test(NAME kwin-testTabBoxClientModel COMMAND testTabBoxClientModel)
|
||||||
|
@ -50,10 +52,6 @@ set(testTabBoxHandler_SRCS
|
||||||
add_executable(testTabBoxHandler ${testTabBoxHandler_SRCS})
|
add_executable(testTabBoxHandler ${testTabBoxHandler_SRCS})
|
||||||
set_target_properties(testTabBoxHandler PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
set_target_properties(testTabBoxHandler PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
|
||||||
target_link_libraries(testTabBoxHandler
|
target_link_libraries(testTabBoxHandler
|
||||||
KF5::ConfigCore
|
|
||||||
KF5::I18n
|
|
||||||
KF5::Package
|
|
||||||
KF5::WindowSystem
|
|
||||||
Qt5::Core
|
Qt5::Core
|
||||||
Qt5::DBus
|
Qt5::DBus
|
||||||
Qt5::Quick
|
Qt5::Quick
|
||||||
|
@ -61,6 +59,12 @@ target_link_libraries(testTabBoxHandler
|
||||||
Qt5::Test
|
Qt5::Test
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
Qt5::X11Extras
|
Qt5::X11Extras
|
||||||
|
|
||||||
|
KF5::ConfigCore
|
||||||
|
KF5::I18n
|
||||||
|
KF5::Package
|
||||||
|
KF5::WindowSystem
|
||||||
|
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
)
|
)
|
||||||
add_test(NAME kwin-testTabBoxHandler COMMAND testTabBoxHandler)
|
add_test(NAME kwin-testTabBoxHandler COMMAND testTabBoxHandler)
|
||||||
|
|
|
@ -22,12 +22,13 @@ ki18n_wrap_ui(kwincomposing_SRC compositing.ui)
|
||||||
add_library(kwincompositing MODULE ${kwincomposing_SRC})
|
add_library(kwincompositing MODULE ${kwincomposing_SRC})
|
||||||
|
|
||||||
target_link_libraries(kwincompositing
|
target_link_libraries(kwincompositing
|
||||||
|
Qt5::DBus
|
||||||
|
Qt5::Widgets
|
||||||
|
|
||||||
KF5::ConfigCore
|
KF5::ConfigCore
|
||||||
KF5::CoreAddons
|
KF5::CoreAddons
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
KF5::KCMUtils
|
KF5::KCMUtils
|
||||||
Qt5::DBus
|
|
||||||
Qt5::Widgets
|
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
|
install(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||||
|
|
|
@ -16,11 +16,13 @@ set(kcm_kwin_virtualdesktops_PART_SRCS
|
||||||
add_library(kcm_kwin_virtualdesktops MODULE ${kcm_kwin_virtualdesktops_PART_SRCS})
|
add_library(kcm_kwin_virtualdesktops MODULE ${kcm_kwin_virtualdesktops_PART_SRCS})
|
||||||
|
|
||||||
target_link_libraries(kcm_kwin_virtualdesktops
|
target_link_libraries(kcm_kwin_virtualdesktops
|
||||||
|
Qt5::DBus
|
||||||
|
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
KF5::KCMUtils
|
KF5::KCMUtils
|
||||||
KF5::QuickAddons
|
KF5::QuickAddons
|
||||||
KF5::XmlGui
|
KF5::XmlGui
|
||||||
Qt5::DBus
|
|
||||||
kcmkwincommon
|
kcmkwincommon
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,14 @@ set(kcm_kwin_effects_PART_SRCS
|
||||||
add_library(kcm_kwin_effects MODULE ${kcm_kwin_effects_PART_SRCS})
|
add_library(kcm_kwin_effects MODULE ${kcm_kwin_effects_PART_SRCS})
|
||||||
|
|
||||||
target_link_libraries(kcm_kwin_effects
|
target_link_libraries(kcm_kwin_effects
|
||||||
|
Qt5::DBus
|
||||||
|
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
KF5::KCMUtils
|
KF5::KCMUtils
|
||||||
KF5::NewStuff
|
KF5::NewStuff
|
||||||
KF5::QuickAddons
|
KF5::QuickAddons
|
||||||
KF5::XmlGui
|
KF5::XmlGui
|
||||||
Qt5::DBus
|
|
||||||
kcmkwincommon
|
kcmkwincommon
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -21,14 +21,15 @@ set(kwin_kcm_rules_XCB_LIBS
|
||||||
)
|
)
|
||||||
|
|
||||||
set(kcm_libs
|
set(kcm_libs
|
||||||
|
Qt5::Concurrent
|
||||||
|
Qt5::X11Extras
|
||||||
|
|
||||||
KF5::Completion
|
KF5::Completion
|
||||||
KF5::ConfigWidgets
|
KF5::ConfigWidgets
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
KF5::Service
|
KF5::Service
|
||||||
KF5::WindowSystem
|
KF5::WindowSystem
|
||||||
KF5::XmlGui
|
KF5::XmlGui
|
||||||
Qt5::Concurrent
|
|
||||||
Qt5::X11Extras
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if (KWIN_BUILD_ACTIVITIES)
|
if (KWIN_BUILD_ACTIVITIES)
|
||||||
|
|
|
@ -12,6 +12,8 @@ set(kcm_kwinscreenedges_PART_SRCS main.cpp ${kcm_screenedges_SRCS})
|
||||||
ki18n_wrap_ui(kcm_kwinscreenedges_PART_SRCS main.ui)
|
ki18n_wrap_ui(kcm_kwinscreenedges_PART_SRCS main.ui)
|
||||||
add_library(kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS})
|
add_library(kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS})
|
||||||
set(kcm_screenedges_LIBS
|
set(kcm_screenedges_LIBS
|
||||||
|
Qt5::DBus
|
||||||
|
|
||||||
KF5::Completion
|
KF5::Completion
|
||||||
KF5::ConfigCore
|
KF5::ConfigCore
|
||||||
KF5::ConfigWidgets
|
KF5::ConfigWidgets
|
||||||
|
@ -19,7 +21,7 @@ set(kcm_screenedges_LIBS
|
||||||
KF5::Package
|
KF5::Package
|
||||||
KF5::Plasma
|
KF5::Plasma
|
||||||
KF5::Service
|
KF5::Service
|
||||||
Qt5::DBus
|
|
||||||
kwin4_effect_builtins
|
kwin4_effect_builtins
|
||||||
)
|
)
|
||||||
target_link_libraries(kcm_kwinscreenedges ${X11_LIBRARIES} ${kcm_screenedges_LIBS})
|
target_link_libraries(kcm_kwinscreenedges ${X11_LIBRARIES} ${kcm_screenedges_LIBS})
|
||||||
|
|
|
@ -14,12 +14,13 @@ ki18n_wrap_ui(kcm_SRCS module.ui)
|
||||||
add_library(kcm_kwin_scripts MODULE ${kcm_SRCS})
|
add_library(kcm_kwin_scripts MODULE ${kcm_SRCS})
|
||||||
|
|
||||||
target_link_libraries(kcm_kwin_scripts
|
target_link_libraries(kcm_kwin_scripts
|
||||||
|
Qt5::DBus
|
||||||
|
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
KF5::KCMUtils
|
KF5::KCMUtils
|
||||||
KF5::KIOCore
|
KF5::KIOCore
|
||||||
KF5::NewStuff
|
KF5::NewStuff
|
||||||
KF5::Package
|
KF5::Package
|
||||||
Qt5::DBus
|
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR})
|
install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||||
|
|
|
@ -18,6 +18,8 @@ qt5_add_dbus_interface(kcm_kwintabbox_PART_SRCS ${KWIN_SOURCE_DIR}/org.kde.kwin.
|
||||||
add_library(kcm_kwintabbox MODULE ${kcm_kwintabbox_PART_SRCS})
|
add_library(kcm_kwintabbox MODULE ${kcm_kwintabbox_PART_SRCS})
|
||||||
|
|
||||||
target_link_libraries(kcm_kwintabbox
|
target_link_libraries(kcm_kwintabbox
|
||||||
|
Qt5::Quick
|
||||||
|
|
||||||
KF5::Completion
|
KF5::Completion
|
||||||
KF5::GlobalAccel
|
KF5::GlobalAccel
|
||||||
KF5::I18n
|
KF5::I18n
|
||||||
|
@ -25,8 +27,9 @@ target_link_libraries(kcm_kwintabbox
|
||||||
KF5::NewStuff
|
KF5::NewStuff
|
||||||
KF5::Package
|
KF5::Package
|
||||||
KF5::Service
|
KF5::Service
|
||||||
Qt5::Quick
|
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
|
|
||||||
kwin4_effect_builtins
|
kwin4_effect_builtins
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,11 @@ add_library(kwinxrenderutils SHARED ${kwin_XRENDERUTILS_SRCS})
|
||||||
generate_export_header(kwinxrenderutils EXPORT_FILE_NAME kwinxrenderutils_export.h)
|
generate_export_header(kwinxrenderutils EXPORT_FILE_NAME kwinxrenderutils_export.h)
|
||||||
target_link_libraries(kwinxrenderutils
|
target_link_libraries(kwinxrenderutils
|
||||||
PUBLIC
|
PUBLIC
|
||||||
KF5::WaylandServer
|
|
||||||
Qt5::Core
|
Qt5::Core
|
||||||
Qt5::Gui
|
Qt5::Gui
|
||||||
|
|
||||||
|
KF5::WaylandServer
|
||||||
|
|
||||||
XCB::RENDER
|
XCB::RENDER
|
||||||
XCB::XCB
|
XCB::XCB
|
||||||
XCB::XFIXES
|
XCB::XFIXES
|
||||||
|
|
|
@ -9,8 +9,10 @@ include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
|
||||||
add_library(KWinWaylandHwcomposerBackend MODULE ${HWCOMPOSER_SOURCES})
|
add_library(KWinWaylandHwcomposerBackend MODULE ${HWCOMPOSER_SOURCES})
|
||||||
set_target_properties(KWinWaylandHwcomposerBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.waylandbackends/")
|
set_target_properties(KWinWaylandHwcomposerBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.waylandbackends/")
|
||||||
target_link_libraries(KWinWaylandHwcomposerBackend
|
target_link_libraries(KWinWaylandHwcomposerBackend
|
||||||
SceneOpenGLBackend
|
|
||||||
kwin
|
kwin
|
||||||
|
|
||||||
|
SceneOpenGLBackend
|
||||||
|
|
||||||
libhybris::hwcomposer
|
libhybris::hwcomposer
|
||||||
libhybris::hybriseglplatform
|
libhybris::hybriseglplatform
|
||||||
libhybris::libhardware
|
libhybris::libhardware
|
||||||
|
|
|
@ -20,8 +20,8 @@ qt5_add_resources(SCENE_OPENGL_SRCS resources.qrc)
|
||||||
add_library(KWinSceneOpenGL MODULE ${SCENE_OPENGL_SRCS})
|
add_library(KWinSceneOpenGL MODULE ${SCENE_OPENGL_SRCS})
|
||||||
set_target_properties(KWinSceneOpenGL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.scenes/")
|
set_target_properties(KWinSceneOpenGL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.scenes/")
|
||||||
target_link_libraries(KWinSceneOpenGL
|
target_link_libraries(KWinSceneOpenGL
|
||||||
SceneOpenGLBackend
|
|
||||||
kwin
|
kwin
|
||||||
|
SceneOpenGLBackend
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
|
|
@ -3,8 +3,8 @@ set(SCENE_QPAINTER_SRCS scene_qpainter.cpp)
|
||||||
add_library(KWinSceneQPainter MODULE scene_qpainter.cpp)
|
add_library(KWinSceneQPainter MODULE scene_qpainter.cpp)
|
||||||
set_target_properties(KWinSceneQPainter PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.scenes/")
|
set_target_properties(KWinSceneQPainter PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.scenes/")
|
||||||
target_link_libraries(KWinSceneQPainter
|
target_link_libraries(KWinSceneQPainter
|
||||||
SceneQPainterBackend
|
|
||||||
kwin
|
kwin
|
||||||
|
SceneQPainterBackend
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
|
Loading…
Reference in a new issue