Commit 6a0430ea authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Fix builtin effects not loading

The api of kcoreaddons_target_static_plugins() has changed so static
plugins must be linked with kwin_x11 and kwin_wayland directly.
parent e8eb55ad
Pipeline #133768 passed with stage
in 18 minutes and 18 seconds
......@@ -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)
......
......@@ -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()
......
......@@ -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}
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment