diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt index 2dbf238575..9dc8c9a2f9 100644 --- a/autotests/integration/CMakeLists.txt +++ b/autotests/integration/CMakeLists.txt @@ -49,7 +49,6 @@ target_link_libraries(KWinIntegrationTestFramework kwin PRIVATE - kwin4_effect_builtins # Own libraries KWinXwaylandServerModule @@ -59,6 +58,7 @@ target_link_libraries(KWinIntegrationTestFramework KF5WindowSystemKWinPlugin KF5IdleTimeKWinPlugin ) +kcoreaddons_target_static_plugins(KWinIntegrationTestFramework "kwin/effects/plugins" LINK_OPTION "PRIVATE") set_target_properties(KWinIntegrationTestFramework PROPERTIES CXX_VISIBILITY_PRESET default) function(integrationTest) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79e88d8dd4..230a00998e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -271,11 +271,11 @@ generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h) add_executable(kwin_x11 main_x11.cpp) target_link_libraries(kwin_x11 - kwin4_effect_builtins kwin KF5::Crash Qt::X11Extras ) +kcoreaddons_target_static_plugins(kwin_x11 "kwin/effects/plugins") install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) install(TARGETS kwin_x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) @@ -287,11 +287,11 @@ add_executable(kwin_wayland tabletmodemanager.cpp ) target_link_libraries(kwin_wayland - kwin4_effect_builtins kwin KF5::Crash KWinXwaylandServerModule ) +kcoreaddons_target_static_plugins(kwin_wayland "kwin/effects/plugins") if (HAVE_LIBCAP) target_link_libraries(kwin_wayland ${Libcap_LIBRARIES}) endif() diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt index 7e1bb861f0..4c6e413058 100644 --- a/src/effects/CMakeLists.txt +++ b/src/effects/CMakeLists.txt @@ -161,16 +161,3 @@ add_subdirectory(snaphelper) add_subdirectory(startupfeedback) add_subdirectory(trackmouse) add_subdirectory(wobblywindows) - -############################################################################### - -# Add the builtins plugin -add_library(kwin4_effect_builtins STATIC) -kcoreaddons_target_static_plugins(kwin4_effect_builtins "kwin/effects/plugins" LINK_OPTION "PRIVATE") -target_link_libraries(kwin4_effect_builtins PRIVATE - ${kwin_effect_KDE_LIBS} - ${kwin_effect_OWN_LIBS} - ${kwin_effect_QT_LIBS} - ${kwin_effect_XCB_LIBS} - ${kwin_effect_XLIB_LIBS} -)