diff --git a/CMakeLists.txt b/CMakeLists.txt index 85bd41505f..dfb6ce8bc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,9 +223,9 @@ set(kwin_OWN_LIBS ) set(kwin_QT_LIBS - ${Qt5Quick_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} Qt5::DBus + Qt5::Quick + Qt5::X11Extras ) set(kwin_KDE_LIBS diff --git a/clients/aurorae/src/CMakeLists.txt b/clients/aurorae/src/CMakeLists.txt index 1f817f5e4b..fca2191199 100644 --- a/clients/aurorae/src/CMakeLists.txt +++ b/clients/aurorae/src/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(kwin3_aurorae KF5::KService ${KDE4Support_LIBRARIES} # KGlobal ${KDE4_KDECORE_LIBS} # needed for KDebug - ${Qt5Declarative_LIBRARIES} + Qt5::Declarative kdecorations ) @@ -33,7 +33,7 @@ set(decoration_plugin_SRCS add_library(decorationplugin SHARED ${decoration_plugin_SRCS}) target_link_libraries(decorationplugin ${KDE4Support_LIBRARIES} # KGlobalSettings - ${Qt5Declarative_LIBRARIES} + Qt5::Declarative kdecorations KF5::KConfigWidgets ) diff --git a/clients/aurorae/themes/plastik/code/CMakeLists.txt b/clients/aurorae/themes/plastik/code/CMakeLists.txt index 03053464d5..1685dff302 100644 --- a/clients/aurorae/themes/plastik/code/CMakeLists.txt +++ b/clients/aurorae/themes/plastik/code/CMakeLists.txt @@ -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} KF5::KConfigWidgets kdecorations) +target_link_libraries(plastikplugin Qt5::Core Qt5::Declarative 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) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 67217677c4..83106e7363 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -12,9 +12,9 @@ set(kwin_effect_KDE_LIBS ) set(kwin_effect_QT_LIBS - ${Qt5Quick_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} - ${Qt5DBus_LIBRARIES} + Qt5::DBus + Qt5::Quick + Qt5::X11Extras ) set(kwin_effect_XLIB_LIBS @@ -88,7 +88,7 @@ macro( KWIN4_ADD_EFFECT_CONFIG name ) endif() target_link_libraries( kcm_kwin4_effect_${name} kwineffects - ${Qt5Widgets_LIBRARIES} + Qt5::Widgets ${KDE4Support_LIBRARIES} ${KDE4_KIO_LIBRARY} # KUrlRequester KF5::KCoreAddons diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 82158fb736..8a2f14c674 100644 --- a/killer/CMakeLists.txt +++ b/killer/CMakeLists.txt @@ -7,8 +7,8 @@ kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS}) set_target_properties(kwin_killer_helper PROPERTIES COMPILE_FLAGS ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}) target_link_libraries(kwin_killer_helper - ${Qt5Widgets_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} + Qt5::Widgets + Qt5::X11Extras ${KDE4Support_LIBRARIES} # KCmdLineArgs ${KInterProcessWindowing_LIBRARY} KF5::KAuth diff --git a/libkdecorations/CMakeLists.txt b/libkdecorations/CMakeLists.txt index ab80b911fa..e7629f56a7 100644 --- a/libkdecorations/CMakeLists.txt +++ b/libkdecorations/CMakeLists.txt @@ -10,8 +10,8 @@ set(kdecorations_LIB_SRCS kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS}) target_link_libraries(kdecorations - ${Qt5Widgets_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} + Qt5::Widgets + Qt5::X11Extras ${KDE4Support_LIBRARIES} # kdebug KF5::KConfigCore KF5::KI18n diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt index 43d7a5ce61..bec609dc56 100644 --- a/libkwineffects/CMakeLists.txt +++ b/libkwineffects/CMakeLists.txt @@ -10,9 +10,9 @@ set(kwin_EFFECTSLIB_SRCS ) set(kwineffects_QT_LIBS - ${Qt5DBus_LIBRARIES} - ${Qt5Widgets_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} + Qt5::DBus + Qt5::Widgets + Qt5::X11Extras ) set(kwineffects_KDE_LIBS diff --git a/scripting/CMakeLists.txt b/scripting/CMakeLists.txt index afc82483eb..dfb9f40259 100644 --- a/scripting/CMakeLists.txt +++ b/scripting/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries( kcm_kwin4_genericscripted KF5::KService KF5::plasma Qt5::DBus - ${Qt5UiTools_LIBRARIES} ) + Qt5::UiTools ) install( TARGETS kcm_kwin4_genericscripted DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tabbox/tests/CMakeLists.txt b/tabbox/tests/CMakeLists.txt index 54fef7a49a..b8a1866f7b 100644 --- a/tabbox/tests/CMakeLists.txt +++ b/tabbox/tests/CMakeLists.txt @@ -43,7 +43,7 @@ set( testTabBoxConfig_SRCS ) kde4_add_unit_test( testTabBoxConfig TESTNAME kwin-testTabBoxConfig ${testTabBoxConfig_SRCS} ) -target_link_libraries( testTabBoxConfig ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ) +target_link_libraries( testTabBoxConfig Qt5::Core Qt5::Test ) ######################################################## @@ -55,4 +55,4 @@ set( testDesktopChain_SRCS ) kde4_add_unit_test( testDesktopChain TESTNAME kwin-testDesktopChain ${testDesktopChain_SRCS} ) -target_link_libraries( testDesktopChain ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ) +target_link_libraries( testDesktopChain Qt5::Core Qt5::Test ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 86615d3eb4..6dd0e685e0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,7 +9,7 @@ set( testUpdateKWin49_SRCS test_update_kwin_49.cpp ../data/update_kwin_49.cpp .. set( testScreenPaintData_SRCS test_screen_paint_data.cpp ) kde4_add_unit_test( testScreenPaintData TESTNAME kwin-TestScreenPaintData ${testScreenPaintData_SRCS} ) -target_link_libraries( testScreenPaintData kwineffects ${Qt5Test_LIBRARIES} ) +target_link_libraries( testScreenPaintData kwineffects Qt5::Test ) ######################################################## # Test WindowPaintData @@ -17,7 +17,7 @@ target_link_libraries( testScreenPaintData kwineffects ${Qt5Test_LIBRARIES} ) set( testWindowPaintData_SRCS test_window_paint_data.cpp ) kde4_add_unit_test( testWindowPaintData TESTNAME kwin-TestWindowPaintData ${testWindowPaintData_SRCS} ) -target_link_libraries( testWindowPaintData kwineffects ${Qt5Widgets_LIBRARIES} ${Qt5Test_LIBRARIES} ) +target_link_libraries( testWindowPaintData kwineffects Qt5::Widgets Qt5::Test ) ######################################################## # Test VirtualDesktopManager @@ -30,8 +30,8 @@ kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${test target_link_libraries( testVirtualDesktops ${KDE4Support_LIBRARIES} - ${Qt5Test_LIBRARIES} - ${Qt5Widgets_LIBRARIES} + Qt5::Test + Qt5::Widgets KF5::KI18n KF5::XmlGui KF5::KWindowSystem @@ -50,9 +50,9 @@ set( testClientMachine_SRCS kde4_add_unit_test( testClientMachine TESTNAME kwin-TestClientMachine ${testClientMachine_SRCS} ) target_link_libraries( testClientMachine - ${Qt5Test_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} - ${Qt5Widgets_LIBRARIES} + Qt5::Test + Qt5::X11Extras + Qt5::Widgets ${KDE4Support_LIBRARIES} # kdebug KF5::KWindowSystem ${XCB_XCB_LIBRARIES} @@ -70,9 +70,9 @@ set( testXcbWrapper_SRCS kde4_add_unit_test( testXcbWrapper TESTNAME kwin-TestXcbWrapper ${testXcbWrapper_SRCS} ) target_link_libraries( testXcbWrapper - ${Qt5Test_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} - ${Qt5Widgets_LIBRARIES} + Qt5::Test + Qt5::X11Extras + Qt5::Widgets ${XCB_XCB_LIBRARIES} ) @@ -85,8 +85,8 @@ set( testXcbWindow_SRCS kde4_add_unit_test( testXcbWindow TESTNAME kwin-TestXcbWindow ${testXcbWindow_SRCS} ) target_link_libraries( testXcbWindow - ${Qt5Test_LIBRARIES} - ${Qt5X11Extras_LIBRARIES} - ${Qt5Widgets_LIBRARIES} + Qt5::Test + Qt5::X11Extras + Qt5::Widgets ${XCB_XCB_LIBRARIES} )