yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Link KI18n with libkwin privately

Browse source
This commit is contained in:
Vlad Zahorodnii 2023-10-25 00:30:03 +03:00
parent e01da45d13
commit 3bed991941
9 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
autotests/integration/CMakeLists.txt
View file

@ -63,7 +63,7 @@ function(integrationTest)
add_test(NAME kwin-${ARGS_NAME} COMMAND dbus-run-session ${CMAKE_BINARY_DIR}/bin/${ARGS_NAME})
endfunction()
integrationTest(NAME testDontCrashGlxgears SRCS dont_crash_glxgears.cpp LIBS KDecoration2::KDecoration)
integrationTest(NAME testDontCrashGlxgears SRCS dont_crash_glxgears.cpp LIBS KF6::I18n KDecoration2::KDecoration)
if (KWIN_BUILD_SCREENLOCKER)
integrationTest(NAME testLockScreen SRCS lockscreen.cpp LIBS KF6::GlobalAccel)
endif()
@ -93,8 +93,8 @@ integrationTest(NAME testPointerConstraints SRCS pointer_constraints_test.cpp)
integrationTest(NAME testKeyboardLayout SRCS keyboard_layout_test.cpp LIBS KF6::GlobalAccel XKB::XKB)
integrationTest(NAME testKeymapCreationFailure SRCS keymap_creation_failure_test.cpp LIBS KF6::GlobalAccel)
integrationTest(NAME testShowingDesktop SRCS showing_desktop_test.cpp)
integrationTest(NAME testDontCrashUseractionsMenu SRCS dont_crash_useractions_menu.cpp)
integrationTest(NAME testKWinBindings SRCS kwinbindings_test.cpp)
integrationTest(NAME testDontCrashUseractionsMenu SRCS dont_crash_useractions_menu.cpp LIBS KF6::I18n)
integrationTest(NAME testKWinBindings SRCS kwinbindings_test.cpp LIBS KF6::I18n)
integrationTest(NAME testLayerShellV1Window SRCS layershellv1window_test.cpp)
integrationTest(NAME testVirtualDesktop SRCS virtual_desktop_test.cpp)
integrationTest(NAME testXdgShellWindowRules SRCS xdgshellwindow_rules_test.cpp)
@ -119,7 +119,7 @@ integrationTest(NAME testXwaylandInput SRCS xwayland_input_test.cpp LIBS XCB::IC
integrationTest(NAME testWindowRules SRCS window_rules_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testX11Window SRCS x11_window_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testQuickTiling SRCS quick_tiling_test.cpp LIBS XCB::ICCCM KDecoration2::KDecoration)
integrationTest(NAME testGlobalShortcuts SRCS globalshortcuts_test.cpp LIBS XCB::ICCCM KF6::GlobalAccel XKB::XKB)
integrationTest(NAME testGlobalShortcuts SRCS globalshortcuts_test.cpp LIBS XCB::ICCCM KF6::GlobalAccel KF6::I18n XKB::XKB)
integrationTest(NAME testStackingOrder SRCS stacking_order_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testDbusInterface SRCS dbus_interface_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testXwaylandServerCrash SRCS xwaylandserver_crash_test.cpp LIBS XCB::ICCCM)

2
autotests/integration/effects/CMakeLists.txt
View file

@ -3,7 +3,7 @@ integrationTest(NAME testSlidingPopups SRCS slidingpopups_test.cpp LIBS XCB::ICC
integrationTest(NAME testShadeWobblyWindows SRCS wobbly_shade_test.cpp LIBS XCB::ICCCM BUILTIN_EFFECTS)
integrationTest(NAME testScriptedEffects SRCS scripted_effects_test.cpp LIBS KF6::GlobalAccel BUILTIN_EFFECTS)
integrationTest(NAME testToplevelOpenCloseAnimation SRCS toplevel_open_close_animation_test.cpp BUILTIN_EFFECTS)
integrationTest(NAME testPopupOpenCloseAnimation SRCS popup_open_close_animation_test.cpp LIBS KDecoration2::KDecoration2Private BUILTIN_EFFECTS)
integrationTest(NAME testPopupOpenCloseAnimation SRCS popup_open_close_animation_test.cpp LIBS KF6::I18n KDecoration2::KDecoration2Private BUILTIN_EFFECTS)
integrationTest(NAME testDesktopSwitchingAnimation SRCS desktop_switching_animation_test.cpp BUILTIN_EFFECTS)
integrationTest(NAME testMinimizeAnimation SRCS minimize_animation_test.cpp BUILTIN_EFFECTS)
integrationTest(NAME testMaximizeAnimation SRCS maximize_animation_test.cpp BUILTIN_EFFECTS)

2
src/CMakeLists.txt
View file

@ -207,7 +207,6 @@ target_link_libraries(kwin
Qt::Quick
Qt::Widgets
Wayland::Server
KF6::I18n
PRIVATE
@ -219,6 +218,7 @@ target_link_libraries(kwin
KF6::CoreAddons
KF6::Crash
KF6::GlobalAccel
KF6::I18n
KF6::Package
KF6::Service
KF6::WindowSystem

1
src/KWinConfig.cmake.in
View file

@ -5,7 +5,6 @@ find_dependency(Qt6Core "@QT_MIN_VERSION@")
find_dependency(Qt6Gui "@QT_MIN_VERSION@")
find_dependency(Qt6Concurrent "@QT_MIN_VERSION@")
find_dependency(Qt6Quick "@QT_MIN_VERSION@")
find_dependency(KF6I18n "@KF6_MIN_VERSION@")
find_dependency(KWinEffects)
@PACKAGE_SETUP_KWIN_AUTOMOC_VARIABLES@

2
src/backends/x11/standalone/CMakeLists.txt
View file

@ -18,7 +18,7 @@ set(X11PLATFORM_SOURCES
)
add_library(KWinX11Platform OBJECT ${X11PLATFORM_SOURCES})
target_link_libraries(KWinX11Platform kwin KF6::Crash X11::X11 XCB::XKB PkgConfig::XKBX11 Qt::GuiPrivate Libdrm::Libdrm
target_link_libraries(KWinX11Platform kwin KF6::Crash KF6::I18n X11::X11 XCB::XKB PkgConfig::XKBX11 Qt::GuiPrivate Libdrm::Libdrm
XCB::COMPOSITE XCB::KEYSYMS XCB::RANDR)
if (X11_Xi_FOUND)
target_sources(KWinX11Platform PRIVATE x11_standalone_xinputintegration.cpp)

2
src/plugins/krunner-integration/CMakeLists.txt
View file

@ -6,6 +6,6 @@ set(krunnerintegration_SOURCES
qt_add_dbus_adaptor(krunnerintegration_SOURCES org.kde.krunner1.xml windowsrunnerinterface.h KWin::WindowsRunner)
kcoreaddons_add_plugin(krunnerintegration SOURCES ${krunnerintegration_SOURCES} INSTALL_NAMESPACE "kwin/plugins")
target_link_libraries(krunnerintegration kwin KF6::Runner)
target_link_libraries(krunnerintegration kwin KF6::I18n KF6::Runner)
install(FILES kwin-runner-windows.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)

2
src/plugins/nightcolor/CMakeLists.txt
View file

@ -25,7 +25,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
target_sources(nightcolor PRIVATE clockskewnotifierengine_linux.cpp)
endif()
target_link_libraries(nightcolor kwin KF6::ConfigGui KF6::GlobalAccel)
target_link_libraries(nightcolor kwin KF6::ConfigGui KF6::GlobalAccel KF6::I18n)
install(FILES nightcolorsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES org.kde.kwin.ColorCorrect.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})

2
src/plugins/screencast/CMakeLists.txt
View file

@ -18,4 +18,4 @@ ecm_qt_declare_logging_category(screencast
DEFAULT_SEVERITY Warning
)
target_link_libraries(screencast kwin PkgConfig::PipeWire Libdrm::Libdrm)
target_link_libraries(screencast kwin KF6::I18n PkgConfig::PipeWire Libdrm::Libdrm)

2
src/xwayland/CMakeLists.txt
View file

@ -16,7 +16,7 @@ add_library(KWinXwaylandServerModule OBJECT
xwldrophandler.cpp
xwaylandlauncher.cpp
)
target_link_libraries(KWinXwaylandServerModule PUBLIC kwin KWinXwaylandCommon XCB::XCB XCB::RANDR XCB::XFIXES XCB::COMPOSITE XKB::XKB)
target_link_libraries(KWinXwaylandServerModule PUBLIC kwin KF6::I18n KWinXwaylandCommon XCB::XCB XCB::RANDR XCB::XFIXES XCB::COMPOSITE XKB::XKB)
if(TARGET KF6::Notifications)
target_link_libraries(KWinXwaylandServerModule PUBLIC KF6::Notifications)
endif()