From ce48bc09978a7fde9708f2d3adb614fdbca9bbd0 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 17 Jun 2023 23:26:56 +0300 Subject: [PATCH] generic: preperations for kdelibs changes automatically replaced via: find -name CMakeLists.txt -exec sed -e 's|${KDE4_PLASMA_LIBS}|KDE4::plasma|g' -e 's|${KDE4_KIO_LIBS}|KDE4::kio|g' -e 's|${KDE4_SOLID_LIBS}|KDE4::solid|g' -e 's|${KDE4_KFILE_LIBS}|KDE4::kfile|g' -e 's|${KDE4_KDECORE_LIBS}|KDE4::kdecore|g' -e 's|${KDE4_KDEUI_LIBS}|KDE4::kdeui|g' -e 's|${KDE4_KCMUTILS_LIBS}|KDE4::kcmutils|g' -e 's|${KDE4_KDECLARATIVE_LIBS}|KDE4::kdeclarative|g' -e 's|${KDE4_KPTY_LIBS}|KDE4::kpty|g' -e 's|${KDE4_KEMAIL_LIBS}|KDE4::kemail|g' -e 's|${KDE4_KMEDIAPLAYER_LIBS}|KDE4::kmediaplayer|g' -e 's|${KDE4_KPARTS_LIBS}|KDE4::kparts|g' -e 's|${KDE4_KIDLETIME_LIBS}|KDE4::kidletime|g' -e 's|${KDE4_KTEXTEDITOR_LIBS}|KDE4::ktexteditor|g' -e 's|${KDE4_KPASSWDSTORE_LIBS}|KDE4::kpasswdstore|g' -e 's|${KDE4_KARCHIVE_LIBS}|KDE4::karchive|g' -e 's|${KDE4_KDNSSD_LIBS}|KDE4::kdnssd|g' -e 's|${KDE4_KNOTIFYCONFIG_LIBS}|KDE4::knotifyconfig|g' -e 's|${KDE4_KEXIV2_LIBS}|KDE4::kexiv2|g' -i {} + Signed-off-by: Ivailo Monev --- dolphin/plugins/bazaar/CMakeLists.txt | 2 +- dolphin/plugins/dropbox/CMakeLists.txt | 2 +- dolphin/plugins/git/CMakeLists.txt | 2 +- dolphin/plugins/hg/CMakeLists.txt | 2 +- dolphin/plugins/svn/CMakeLists.txt | 2 +- dolphin/src/CMakeLists.txt | 26 ++++++++-------- dolphin/src/tests/CMakeLists.txt | 20 ++++++------- drkonqi/CMakeLists.txt | 4 +-- drkonqi/tests/crashtest/CMakeLists.txt | 2 +- .../kate/close-except-like/CMakeLists.txt | 6 ++-- kate/addons/kate/filebrowser/CMakeLists.txt | 4 +-- .../kate/filetemplates/plugin/CMakeLists.txt | 4 +-- kate/addons/kate/helloworld/CMakeLists.txt | 2 +- kate/addons/kate/kate-ctags/CMakeLists.txt | 4 +-- .../kate/katebuild-plugin/CMakeLists.txt | 4 +-- kate/addons/kate/konsole/CMakeLists.txt | 4 +-- kate/addons/kate/mailfiles/CMakeLists.txt | 4 +-- kate/addons/kate/openheader/CMakeLists.txt | 6 ++-- kate/addons/kate/project/CMakeLists.txt | 4 +-- kate/addons/kate/search/CMakeLists.txt | 6 ++-- .../kate/tabbarextension/CMakeLists.txt | 4 +-- kate/addons/kate/tabify/CMakeLists.txt | 4 +-- kate/addons/kate/textfilter/CMakeLists.txt | 4 +-- .../ktexteditor/autobrace/CMakeLists.txt | 4 +-- .../ktexteditor/exporter/CMakeLists.txt | 4 +-- .../ktexteditor/hlselection/CMakeLists.txt | 8 ++--- .../ktexteditor/insertfile/CMakeLists.txt | 8 ++--- .../kte_iconinserter/CMakeLists.txt | 4 +-- kate/addons/plasma/session/CMakeLists.txt | 4 +-- kate/part/CMakeLists.txt | 16 +++++----- kate/src/app/CMakeLists.txt | 6 ++-- kate/src/filetree/CMakeLists.txt | 6 ++-- kate/tests/CMakeLists.txt | 30 +++++++++---------- kcminit/CMakeLists.txt | 4 +-- kcmshell/CMakeLists.txt | 4 +-- kcontrol/access/CMakeLists.txt | 6 ++-- kcontrol/autostart/CMakeLists.txt | 2 +- kcontrol/colors/CMakeLists.txt | 4 +-- kcontrol/componentchooser/CMakeLists.txt | 4 +-- kcontrol/dateandtime/CMakeLists.txt | 6 ++-- kcontrol/desktoppaths/CMakeLists.txt | 4 +-- kcontrol/desktoptheme/CMakeLists.txt | 12 ++++---- kcontrol/ebrowsing/CMakeLists.txt | 2 +- kcontrol/fonts/CMakeLists.txt | 2 +- kcontrol/hardware/display/CMakeLists.txt | 4 +-- kcontrol/hardware/joystick/CMakeLists.txt | 4 +-- kcontrol/icons/CMakeLists.txt | 4 +-- kcontrol/icons/tests/CMakeLists.txt | 2 +- kcontrol/input/CMakeLists.txt | 8 ++--- kcontrol/kdebug/CMakeLists.txt | 2 +- kcontrol/kded/CMakeLists.txt | 2 +- kcontrol/keyboard/CMakeLists.txt | 18 +++++------ kcontrol/keyboard/tests/CMakeLists.txt | 12 ++++---- kcontrol/keys/CMakeLists.txt | 2 +- kcontrol/kio/CMakeLists.txt | 4 +-- kcontrol/kmetainfo/CMakeLists.txt | 6 ++-- kcontrol/knotify/CMakeLists.txt | 2 +- kcontrol/kpasswdstore/CMakeLists.txt | 4 +-- kcontrol/launch/CMakeLists.txt | 2 +- kcontrol/locale/CMakeLists.txt | 2 +- kcontrol/mediaplayer/CMakeLists.txt | 2 +- kcontrol/randr/CMakeLists.txt | 4 +-- kcontrol/randr/module/CMakeLists.txt | 4 +-- kcontrol/spellchecking/CMakeLists.txt | 2 +- kcontrol/standard_actions/CMakeLists.txt | 2 +- kcontrol/style/CMakeLists.txt | 4 +-- kcontrol/workspaceoptions/CMakeLists.txt | 2 +- kde-menu/CMakeLists.txt | 2 +- kdepasswd/CMakeLists.txt | 4 +-- kdepasswd/kcm/CMakeLists.txt | 5 ++-- kdesudo/CMakeLists.txt | 2 +- kdialog/CMakeLists.txt | 4 +-- kdirshare/filepropertiesplugin/CMakeLists.txt | 4 +-- kdirshare/kded/CMakeLists.txt | 10 +++---- kdontchangethehostname/CMakeLists.txt | 2 +- keditbookmarks/CMakeLists.txt | 4 +-- keditbookmarks/kbookmarkmodel/CMakeLists.txt | 2 +- .../kbookmarkmodel/tests/CMakeLists.txt | 2 +- keditfiletype/CMakeLists.txt | 4 +-- keditfiletype/tests/CMakeLists.txt | 6 ++-- kfile/CMakeLists.txt | 2 +- kfind/CMakeLists.txt | 4 +-- kfreespace/kcm/CMakeLists.txt | 6 ++-- kfreespace/kded/CMakeLists.txt | 8 ++--- kglobalaccel/CMakeLists.txt | 4 +-- kgreeter/CMakeLists.txt | 4 +-- kgreeter/kcm/CMakeLists.txt | 8 ++--- khotkeys/app/CMakeLists.txt | 2 +- khotkeys/kcm_hotkeys/CMakeLists.txt | 2 +- khotkeys/libkhotkeysprivate/CMakeLists.txt | 2 +- khotkeys/test/CMakeLists.txt | 2 +- kiconfinder/CMakeLists.txt | 2 +- kinfocenter/CMakeLists.txt | 4 +-- kinfocenter/Modules/devinfo/CMakeLists.txt | 2 +- kinfocenter/Modules/info/CMakeLists.txt | 2 +- .../Modules/infosummary/CMakeLists.txt | 2 +- kinfocenter/Modules/kernel/CMakeLists.txt | 2 +- kinfocenter/Modules/memory/CMakeLists.txt | 2 +- kinfocenter/Modules/nics/CMakeLists.txt | 2 +- kinfocenter/Modules/opengl/CMakeLists.txt | 2 +- kinfocenter/Modules/pci/CMakeLists.txt | 4 +-- kinfocenter/Modules/usbview/CMakeLists.txt | 2 +- kinfocenter/Modules/view1394/CMakeLists.txt | 2 +- kioclient/CMakeLists.txt | 8 ++--- kioexec/CMakeLists.txt | 2 +- kioslave/camera/CMakeLists.txt | 2 +- kioslave/desktop/CMakeLists.txt | 4 +-- kioslave/desktop/tests/CMakeLists.txt | 2 +- kioslave/floppy/CMakeLists.txt | 2 +- kioslave/mtp/CMakeLists.txt | 2 +- kioslave/network/ioslave/CMakeLists.txt | 4 +-- kioslave/remote/CMakeLists.txt | 2 +- kioslave/remote/kdedmodule/CMakeLists.txt | 2 +- kioslave/sftp/CMakeLists.txt | 2 +- kioslave/thumbnail/CMakeLists.txt | 16 +++++----- kioslave/trash/CMakeLists.txt | 12 ++++---- kioslave/trash/tests/CMakeLists.txt | 2 +- klipper/CMakeLists.txt | 4 +-- kmail/CMakeLists.txt | 4 +-- kmenuedit/CMakeLists.txt | 2 +- kmimetypefinder/CMakeLists.txt | 2 +- knetattach/CMakeLists.txt | 2 +- knotify/CMakeLists.txt | 6 ++-- konsole/src/CMakeLists.txt | 10 +++---- konsole/src/tests/CMakeLists.txt | 4 +-- kquitapp/CMakeLists.txt | 2 +- kreadconfig/CMakeLists.txt | 4 +-- krunner/CMakeLists.txt | 6 ++-- kscreensaver/CMakeLists.txt | 4 +-- ksmserver/CMakeLists.txt | 10 +++---- ksmserver/kcm/CMakeLists.txt | 2 +- ksmserver/tests/CMakeLists.txt | 8 ++--- kstart/CMakeLists.txt | 2 +- kstyles/oxygen/CMakeLists.txt | 2 +- kstyles/oxygen/config/CMakeLists.txt | 4 +-- kstyles/oxygen/demo/CMakeLists.txt | 2 +- ksysguard/gui/CMakeLists.txt | 2 +- ksysguard/gui/tests/CMakeLists.txt | 2 +- ksystraycmd/CMakeLists.txt | 2 +- ktouchpadenabler/CMakeLists.txt | 4 +-- ktraderclient/CMakeLists.txt | 2 +- kuiserver/CMakeLists.txt | 2 +- kuiserver/tests/CMakeLists.txt | 2 +- kurifilter-plugins/fixhost/CMakeLists.txt | 2 +- kurifilter-plugins/ikws/CMakeLists.txt | 4 +-- kurifilter-plugins/localdomain/CMakeLists.txt | 2 +- kurifilter-plugins/shorturi/CMakeLists.txt | 2 +- kurifilter-plugins/tests/CMakeLists.txt | 2 +- kwin/CMakeLists.txt | 6 ++-- kwin/clients/aurorae/src/CMakeLists.txt | 4 +-- .../themes/plastik/code/CMakeLists.txt | 2 +- kwin/clients/oxygen/CMakeLists.txt | 2 +- kwin/clients/oxygen/config/CMakeLists.txt | 2 +- kwin/clients/oxygen/demo/CMakeLists.txt | 4 +-- kwin/kcmkwin/kwincompositing/CMakeLists.txt | 2 +- kwin/kcmkwin/kwindecoration/CMakeLists.txt | 2 +- kwin/kcmkwin/kwindesktop/CMakeLists.txt | 2 +- kwin/kcmkwin/kwinoptions/CMakeLists.txt | 2 +- kwin/kcmkwin/kwinrules/CMakeLists.txt | 4 +-- kwin/kcmkwin/kwinscreenedges/CMakeLists.txt | 2 +- kwin/kcmkwin/kwintabbox/CMakeLists.txt | 8 ++--- kwin/killer/CMakeLists.txt | 2 +- kwin/libkdecorations/CMakeLists.txt | 4 +-- kwin/libkwineffects/CMakeLists.txt | 2 +- kwin/tabbox/tests/CMakeLists.txt | 4 +-- kwin/tests/CMakeLists.txt | 4 +-- libs/konq/CMakeLists.txt | 4 +-- libs/konq/favicons/CMakeLists.txt | 2 +- libs/konq/tests/CMakeLists.txt | 10 +++---- libs/ksysguard/ksgrd/CMakeLists.txt | 2 +- libs/ksysguard/lsofui/CMakeLists.txt | 4 +-- libs/ksysguard/processcore/CMakeLists.txt | 4 +-- libs/ksysguard/processui/CMakeLists.txt | 4 +-- libs/ksysguard/signalplotter/CMakeLists.txt | 4 +-- libs/ksysguard/tests/CMakeLists.txt | 6 ++-- libs/kworkspace/CMakeLists.txt | 4 +-- libs/oxygen/CMakeLists.txt | 4 +-- libs/plasmaclock/CMakeLists.txt | 6 ++-- libs/plasmagenericshell/CMakeLists.txt | 6 ++-- libs/plasmagenericshell/tests/CMakeLists.txt | 8 ++--- libs/taskmanager/CMakeLists.txt | 6 ++-- plasma/applets/analog-clock/CMakeLists.txt | 4 +-- plasma/applets/calendar/CMakeLists.txt | 4 +-- plasma/applets/digital-clock/CMakeLists.txt | 6 ++-- plasma/applets/folderview/CMakeLists.txt | 8 ++--- plasma/applets/icon/CMakeLists.txt | 2 +- plasma/applets/kickoff/CMakeLists.txt | 12 ++++---- plasma/applets/pager/CMakeLists.txt | 6 ++-- plasma/applets/panelspacer/CMakeLists.txt | 2 +- plasma/applets/quicklaunch/CMakeLists.txt | 6 ++-- plasma/applets/system-monitor/CMakeLists.txt | 20 ++++++------- plasma/applets/systemtray/CMakeLists.txt | 4 +-- plasma/applets/tasks/CMakeLists.txt | 4 +-- plasma/applets/trash/CMakeLists.txt | 2 +- plasma/applets/windowlist/CMakeLists.txt | 4 +-- .../applauncher/CMakeLists.txt | 2 +- .../contextmenu/CMakeLists.txt | 2 +- .../minimalcontextmenu/CMakeLists.txt | 2 +- .../containmentactions/paste/CMakeLists.txt | 2 +- .../switchdesktop/CMakeLists.txt | 2 +- .../switchwindow/CMakeLists.txt | 2 +- plasma/containments/desktop/CMakeLists.txt | 2 +- plasma/containments/newspaper/CMakeLists.txt | 2 +- plasma/containments/panel/CMakeLists.txt | 2 +- .../applicationjobs/CMakeLists.txt | 6 ++-- plasma/dataengines/apps/CMakeLists.txt | 2 +- .../devicenotifications/CMakeLists.txt | 2 +- plasma/dataengines/dict/CMakeLists.txt | 2 +- plasma/dataengines/favicons/CMakeLists.txt | 2 +- plasma/dataengines/filebrowser/CMakeLists.txt | 2 +- plasma/dataengines/geolocation/CMakeLists.txt | 12 ++++---- plasma/dataengines/hotplug/CMakeLists.txt | 8 ++--- plasma/dataengines/mpris2/CMakeLists.txt | 2 +- .../dataengines/notifications/CMakeLists.txt | 2 +- plasma/dataengines/places/CMakeLists.txt | 6 ++-- .../powermanagement/CMakeLists.txt | 2 +- plasma/dataengines/soliddevice/CMakeLists.txt | 8 ++--- .../statusnotifieritem/CMakeLists.txt | 2 +- .../dataengines/systemmonitor/CMakeLists.txt | 2 +- plasma/dataengines/tasks/CMakeLists.txt | 4 +-- plasma/dataengines/time/CMakeLists.txt | 2 +- plasma/dataengines/weather/CMakeLists.txt | 6 ++-- .../dataengines/weather/ions/CMakeLists.txt | 6 ++-- .../weather/ions/noaa/CMakeLists.txt | 2 +- .../weather/ions/wetter.com/CMakeLists.txt | 2 +- plasma/declarativeimports/core/CMakeLists.txt | 4 +-- .../core/tests/CMakeLists.txt | 4 +-- .../dirmodel/CMakeLists.txt | 2 +- .../graphicswidgets/CMakeLists.txt | 2 +- .../declarativeimports/locale/CMakeLists.txt | 2 +- .../plasmacomponents/CMakeLists.txt | 6 ++-- .../plasmaextracomponents/CMakeLists.txt | 2 +- .../qtextracomponents/CMakeLists.txt | 2 +- .../qtextracomponents/tests/CMakeLists.txt | 2 +- plasma/kpart/CMakeLists.txt | 2 +- plasma/runners/bookmarks/CMakeLists.txt | 4 +-- plasma/runners/bookmarks/tests/CMakeLists.txt | 6 ++-- plasma/runners/calculator/CMakeLists.txt | 8 ++--- plasma/runners/kill/CMakeLists.txt | 10 +++---- plasma/runners/locations/CMakeLists.txt | 2 +- plasma/runners/places/CMakeLists.txt | 8 ++--- plasma/runners/plasma-desktop/CMakeLists.txt | 2 +- plasma/runners/powerdevil/CMakeLists.txt | 2 +- plasma/runners/recentdocuments/CMakeLists.txt | 2 +- plasma/runners/services/CMakeLists.txt | 2 +- plasma/runners/sessions/CMakeLists.txt | 2 +- plasma/runners/shell/CMakeLists.txt | 2 +- plasma/runners/solid/CMakeLists.txt | 2 +- plasma/runners/webshortcuts/CMakeLists.txt | 2 +- plasma/runners/windowedwidgets/CMakeLists.txt | 2 +- plasma/runners/windows/CMakeLists.txt | 2 +- plasma/scriptengine/CMakeLists.txt | 4 +-- plasma/shells/plasma-desktop/CMakeLists.txt | 10 +++---- plasma/shells/plasma-windowed/CMakeLists.txt | 6 ++-- plasma/toolboxes/CMakeLists.txt | 4 +-- plasma/wallpapers/color/CMakeLists.txt | 2 +- plasma/wallpapers/image/CMakeLists.txt | 2 +- qguiplatformplugin_kde/CMakeLists.txt | 2 +- solid-actions-kcm/CMakeLists.txt | 4 +-- solid-device-automounter/kcm/CMakeLists.txt | 2 +- solid-device-automounter/kded/CMakeLists.txt | 2 +- solid-hardware/CMakeLists.txt | 2 +- solid-networkstatus/kded/CMakeLists.txt | 2 +- solid-networkstatus/tests/CMakeLists.txt | 2 +- solidautoeject/CMakeLists.txt | 2 +- soliduiserver/CMakeLists.txt | 4 +-- statusnotifierwatcher/CMakeLists.txt | 2 +- systemsettings/app/CMakeLists.txt | 6 ++-- systemsettings/core/CMakeLists.txt | 6 ++-- systemsettings/icons/CMakeLists.txt | 2 +- 270 files changed, 560 insertions(+), 561 deletions(-) diff --git a/dolphin/plugins/bazaar/CMakeLists.txt b/dolphin/plugins/bazaar/CMakeLists.txt index 46748b9f..c698a58b 100644 --- a/dolphin/plugins/bazaar/CMakeLists.txt +++ b/dolphin/plugins/bazaar/CMakeLists.txt @@ -2,7 +2,7 @@ project(fileviewbazaarplugin) kde4_add_plugin(fileviewbazaarplugin fileviewbazaarplugin.cpp) -target_link_libraries(fileviewbazaarplugin ${KDE4_KIO_LIBS} konq) +target_link_libraries(fileviewbazaarplugin KDE4::kio konq) install( FILES diff --git a/dolphin/plugins/dropbox/CMakeLists.txt b/dolphin/plugins/dropbox/CMakeLists.txt index 1668fc98..66d2b4a3 100644 --- a/dolphin/plugins/dropbox/CMakeLists.txt +++ b/dolphin/plugins/dropbox/CMakeLists.txt @@ -2,7 +2,7 @@ project(fileviewdropboxplugin) kde4_add_plugin(fileviewdropboxplugin fileviewdropboxplugin.cpp) -target_link_libraries(fileviewdropboxplugin ${KDE4_KIO_LIBS} konq) +target_link_libraries(fileviewdropboxplugin KDE4::kio konq) install( FILES fileviewdropboxplugin.desktop diff --git a/dolphin/plugins/git/CMakeLists.txt b/dolphin/plugins/git/CMakeLists.txt index f3271b05..64e1110c 100644 --- a/dolphin/plugins/git/CMakeLists.txt +++ b/dolphin/plugins/git/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_kcfg_files(fileviewgitplugin_SRCS fileviewgitpluginsettings.kcfgc) kde4_add_plugin(fileviewgitplugin ${fileviewgitplugin_SRCS}) -target_link_libraries(fileviewgitplugin ${KDE4_KIO_LIBS} konq) +target_link_libraries(fileviewgitplugin KDE4::kio konq) install( FILES fileviewgitplugin.desktop diff --git a/dolphin/plugins/hg/CMakeLists.txt b/dolphin/plugins/hg/CMakeLists.txt index 3f3938a4..d807d267 100644 --- a/dolphin/plugins/hg/CMakeLists.txt +++ b/dolphin/plugins/hg/CMakeLists.txt @@ -36,7 +36,7 @@ kde4_add_kcfg_files(fileviewhgplugin_SRCS fileviewhgpluginsettings.kcfgc) kde4_add_plugin(fileviewhgplugin ${fileviewhgplugin_SRCS}) -target_link_libraries(fileviewhgplugin ${KDE4_KIO_LIBS} ${KDE4_KTEXTEDITOR_LIBS} konq) +target_link_libraries(fileviewhgplugin KDE4::kio KDE4::ktexteditor konq) install( FILES fileviewhgplugin.desktop diff --git a/dolphin/plugins/svn/CMakeLists.txt b/dolphin/plugins/svn/CMakeLists.txt index f69b529c..22dd5cb9 100644 --- a/dolphin/plugins/svn/CMakeLists.txt +++ b/dolphin/plugins/svn/CMakeLists.txt @@ -6,7 +6,7 @@ kde4_add_kcfg_files(fileviewsvnplugin_SRCS fileviewsvnpluginsettings.kcfgc) kde4_add_plugin(fileviewsvnplugin ${fileviewsvnplugin_SRCS}) -target_link_libraries(fileviewsvnplugin ${KDE4_KIO_LIBS} konq) +target_link_libraries(fileviewsvnplugin KDE4::kio konq) install( FILES fileviewsvnplugin.desktop diff --git a/dolphin/src/CMakeLists.txt b/dolphin/src/CMakeLists.txt index b0afb100..d3bf08f1 100644 --- a/dolphin/src/CMakeLists.txt +++ b/dolphin/src/CMakeLists.txt @@ -80,7 +80,7 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) target_link_libraries(dolphinprivate - ${KDE4_KFILE_LIBS} + KDE4::kfile konq ) @@ -106,8 +106,8 @@ set(dolphinpart_SRCS kde4_add_plugin(dolphinpart ${dolphinpart_SRCS}) target_link_libraries(dolphinpart - ${KDE4_KPARTS_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::kparts + KDE4::kfile dolphinprivate konq ) @@ -202,11 +202,11 @@ set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalpanel.cpp) add_executable(dolphin ${dolphin_SRCS}) target_link_libraries(dolphin - ${KDE4_KFILE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KMEDIAPLAYER_LIBS} + KDE4::kfile + KDE4::kparts + KDE4::kcmutils + KDE4::solid + KDE4::kmediaplayer konq dolphinprivate ) @@ -278,10 +278,10 @@ kde4_add_plugin(kcm_dolphinnavigation ${kcm_dolphinnavigation_PART_SRCS}) kde4_add_plugin(kcm_dolphinservices ${kcm_dolphinservices_PART_SRCS}) kde4_add_plugin(kcm_dolphingeneral ${kcm_dolphingeneral_PART_SRCS}) -target_link_libraries(kcm_dolphinviewmodes ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) -target_link_libraries(kcm_dolphinnavigation ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) -target_link_libraries(kcm_dolphinservices ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) -target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) +target_link_libraries(kcm_dolphinviewmodes KDE4::kdeui KDE4::kfile dolphinprivate) +target_link_libraries(kcm_dolphinnavigation KDE4::kdeui KDE4::kfile dolphinprivate) +target_link_libraries(kcm_dolphinservices KDE4::kdeui KDE4::kfile KDE4::kio dolphinprivate) +target_link_libraries(kcm_dolphingeneral KDE4::kdeui KDE4::kfile KDE4::kio dolphinprivate) install( TARGETS @@ -296,7 +296,7 @@ install( add_executable(kio_filenamesearch search/filenamesearchprotocol.cpp) -target_link_libraries(kio_filenamesearch ${KDE4_KIO_LIBS}) +target_link_libraries(kio_filenamesearch KDE4::kio) install( TARGETS kio_filenamesearch diff --git a/dolphin/src/tests/CMakeLists.txt b/dolphin/src/tests/CMakeLists.txt index 7c55f5d2..4d664b90 100644 --- a/dolphin/src/tests/CMakeLists.txt +++ b/dolphin/src/tests/CMakeLists.txt @@ -12,7 +12,7 @@ set(kitemsettest_SRCS kde4_add_test(dolphin-kitemsettest ${kitemsettest_SRCS}) target_link_libraries(dolphin-kitemsettest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -20,7 +20,7 @@ target_link_libraries(dolphin-kitemsettest kde4_add_test(dolphin-kitemrangetest kitemrangetest.cpp) target_link_libraries(dolphin-kitemrangetest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -34,7 +34,7 @@ set(kitemlistselectionmanagertest_SRCS kde4_add_test(dolphin-kitemlistselectionmanagertest ${kitemlistselectionmanagertest_SRCS}) target_link_libraries(dolphin-kitemlistselectionmanagertest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -56,7 +56,7 @@ set(kitemlistcontrollertest_SRCS kde4_add_test(dolphin-kitemlistcontrollertest ${kitemlistcontrollertest_SRCS}) target_link_libraries(dolphin-kitemlistcontrollertest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -77,7 +77,7 @@ set(kfileitemlistviewtest_SRCS kde4_add_test(dolphin-kfileitemlistviewtest ${kfileitemlistviewtest_SRCS}) target_link_libraries(dolphin-kfileitemlistviewtest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -92,7 +92,7 @@ set(kfileitemmodeltest_SRCS kde4_add_test(dolphin-kfileitemmodeltest ${kfileitemmodeltest_SRCS}) target_link_libraries(dolphin-kfileitemmodeltest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -106,7 +106,7 @@ set(kfileitemmodelbenchmark_SRCS kde4_add_manual_test(dolphin-kfileitemmodelbenchmark ${kfileitemmodelbenchmark_SRCS}) target_link_libraries(dolphin-kfileitemmodelbenchmark dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -117,7 +117,7 @@ set(kitemlistkeyboardsearchmanagertest_SRCS ) kde4_add_test(dolphin-kitemlistkeyboardsearchmanagertest ${kitemlistkeyboardsearchmanagertest_SRCS}) target_link_libraries(dolphin-kitemlistkeyboardsearchmanagertest - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -131,7 +131,7 @@ set(kstandarditemmodeltest_SRCS kde4_add_test(dolphin-kstandarditemmodeltest ${kstandarditemmodeltest_SRCS}) target_link_libraries(dolphin-kstandarditemmodeltest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) @@ -148,6 +148,6 @@ kde4_add_kcfg_files(viewpropertiestest_SRCS kde4_add_test(dolphin-viewpropertiestest ${viewpropertiestest_SRCS}) target_link_libraries(dolphin-viewpropertiestest dolphinprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt index d53e350a..2b051e2f 100644 --- a/drkonqi/CMakeLists.txt +++ b/drkonqi/CMakeLists.txt @@ -38,7 +38,7 @@ set(backtrace_parser_SRCS if(ENABLE_TESTING) add_library(drkonqi_backtrace_parser STATIC ${backtrace_parser_SRCS}) - target_link_libraries(drkonqi_backtrace_parser ${KDE4_KDECORE_LIBS}) + target_link_libraries(drkonqi_backtrace_parser KDE4::kdecore) add_subdirectory(tests) endif() @@ -50,7 +50,7 @@ endif() add_executable(drkonqi ${drkonqi_SRCS} ${backtrace_parser_SRCS}) target_link_libraries(drkonqi - ${KDE4_KIO_LIBS} + KDE4::kio ) install(TARGETS drkonqi DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/drkonqi/tests/crashtest/CMakeLists.txt b/drkonqi/tests/crashtest/CMakeLists.txt index 3f1d5e4b..e2562a0a 100644 --- a/drkonqi/tests/crashtest/CMakeLists.txt +++ b/drkonqi/tests/crashtest/CMakeLists.txt @@ -2,4 +2,4 @@ set(crashtest_SRCS crashtest.cpp ) kde4_add_manual_test(crashtest ${crashtest_SRCS}) -target_link_libraries(crashtest ${KDE4_KDEUI_LIBS}) +target_link_libraries(crashtest KDE4::kdeui) diff --git a/kate/addons/kate/close-except-like/CMakeLists.txt b/kate/addons/kate/close-except-like/CMakeLists.txt index 16727b69..a23c7c3c 100644 --- a/kate/addons/kate/close-except-like/CMakeLists.txt +++ b/kate/addons/kate/close-except-like/CMakeLists.txt @@ -11,9 +11,9 @@ set(KATE_CLOSE_EXCEPT_PLUGIN_SOURCES kde4_add_plugin(katecloseexceptplugin ${KATE_CLOSE_EXCEPT_PLUGIN_SOURCES}) target_link_libraries(katecloseexceptplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdeui + KDE4::kfile + KDE4::ktexteditor kateinterfaces ) diff --git a/kate/addons/kate/filebrowser/CMakeLists.txt b/kate/addons/kate/filebrowser/CMakeLists.txt index a40d4eac..14ae5f3c 100644 --- a/kate/addons/kate/filebrowser/CMakeLists.txt +++ b/kate/addons/kate/filebrowser/CMakeLists.txt @@ -8,8 +8,8 @@ set(katefilebrowserplugin_PART_SRCS kde4_add_plugin(katefilebrowserplugin ${katefilebrowserplugin_PART_SRCS}) target_link_libraries(katefilebrowserplugin - ${KDE4_KFILE_LIBS} - ${KDE4_KPARTS_LIBS} + KDE4::kfile + KDE4::kparts kateinterfaces ) diff --git a/kate/addons/kate/filetemplates/plugin/CMakeLists.txt b/kate/addons/kate/filetemplates/plugin/CMakeLists.txt index 81103983..ead84b64 100644 --- a/kate/addons/kate/filetemplates/plugin/CMakeLists.txt +++ b/kate/addons/kate/filetemplates/plugin/CMakeLists.txt @@ -4,8 +4,8 @@ kde4_add_plugin(katefiletemplates filetemplates.cpp) target_link_libraries(katefiletemplates kateinterfaces - ${KDE4_KEMAIL_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kemail + KDE4::ktexteditor ) install( diff --git a/kate/addons/kate/helloworld/CMakeLists.txt b/kate/addons/kate/helloworld/CMakeLists.txt index 7b02bfcc..01bb9cb0 100644 --- a/kate/addons/kate/helloworld/CMakeLists.txt +++ b/kate/addons/kate/helloworld/CMakeLists.txt @@ -1,7 +1,7 @@ kde4_add_plugin(katehelloworldplugin plugin_katehelloworld.cpp) target_link_libraries(katehelloworldplugin - ${KDE4_KDEUI_LIBS} + KDE4::kdeui kateinterfaces ) diff --git a/kate/addons/kate/kate-ctags/CMakeLists.txt b/kate/addons/kate/kate-ctags/CMakeLists.txt index c117f567..437fca60 100644 --- a/kate/addons/kate/kate-ctags/CMakeLists.txt +++ b/kate/addons/kate/kate-ctags/CMakeLists.txt @@ -11,9 +11,9 @@ set(ctagsplugin_SRC kde4_add_plugin(katectagsplugin ${ctagsplugin_SRC}) target_link_libraries(katectagsplugin - ${KDE4_KDECORE_LIBS} + KDE4::kdecore kateinterfaces - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::ktexteditor ) install( diff --git a/kate/addons/kate/katebuild-plugin/CMakeLists.txt b/kate/addons/kate/katebuild-plugin/CMakeLists.txt index 99dee635..18389756 100644 --- a/kate/addons/kate/katebuild-plugin/CMakeLists.txt +++ b/kate/addons/kate/katebuild-plugin/CMakeLists.txt @@ -7,9 +7,9 @@ set(katebuild_SRCS kde4_add_plugin(katebuildplugin ${katebuild_SRCS}) target_link_libraries(katebuildplugin - ${KDE4_KDECORE_LIBS} + KDE4::kdecore kateinterfaces - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::ktexteditor ) install( diff --git a/kate/addons/kate/konsole/CMakeLists.txt b/kate/addons/kate/konsole/CMakeLists.txt index 020b7cdd..0ea00fb0 100644 --- a/kate/addons/kate/konsole/CMakeLists.txt +++ b/kate/addons/kate/konsole/CMakeLists.txt @@ -3,8 +3,8 @@ kde4_add_plugin(katekonsoleplugin kateconsole.cpp) target_link_libraries(katekonsoleplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KPARTS_LIBS} + KDE4::kdeui + KDE4::kparts kateinterfaces ) diff --git a/kate/addons/kate/mailfiles/CMakeLists.txt b/kate/addons/kate/mailfiles/CMakeLists.txt index 3afa9205..eb9060dd 100644 --- a/kate/addons/kate/mailfiles/CMakeLists.txt +++ b/kate/addons/kate/mailfiles/CMakeLists.txt @@ -7,8 +7,8 @@ kde4_add_plugin(katemailfilesplugin ${katemailfilesplugin_PART_SRCS}) target_link_libraries(katemailfilesplugin - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} + KDE4::kdecore + KDE4::kparts kateinterfaces ) diff --git a/kate/addons/kate/openheader/CMakeLists.txt b/kate/addons/kate/openheader/CMakeLists.txt index ca373046..dd6f2b39 100644 --- a/kate/addons/kate/openheader/CMakeLists.txt +++ b/kate/addons/kate/openheader/CMakeLists.txt @@ -4,9 +4,9 @@ kde4_add_plugin(kateopenheaderplugin plugin_kateopenheader.cpp) target_link_libraries(kateopenheaderplugin kateinterfaces - ${KDE4_KIO_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kio + KDE4::kparts + KDE4::ktexteditor ) install( diff --git a/kate/addons/kate/project/CMakeLists.txt b/kate/addons/kate/project/CMakeLists.txt index a2d11672..0c989718 100644 --- a/kate/addons/kate/project/CMakeLists.txt +++ b/kate/addons/kate/project/CMakeLists.txt @@ -16,8 +16,8 @@ set(kateprojectplugin_PART_SRCS kde4_add_plugin(kateprojectplugin ${kateprojectplugin_PART_SRCS}) target_link_libraries(kateprojectplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdeui + KDE4::ktexteditor kateinterfaces ) diff --git a/kate/addons/kate/search/CMakeLists.txt b/kate/addons/kate/search/CMakeLists.txt index 07f46a44..223fad28 100644 --- a/kate/addons/kate/search/CMakeLists.txt +++ b/kate/addons/kate/search/CMakeLists.txt @@ -10,9 +10,9 @@ set(katesearchplugin_PART_SRCS kde4_add_plugin(katesearchplugin ${katesearchplugin_PART_SRCS}) target_link_libraries(katesearchplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KDECORE_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdeui + KDE4::kdecore + KDE4::ktexteditor kateinterfaces ) diff --git a/kate/addons/kate/tabbarextension/CMakeLists.txt b/kate/addons/kate/tabbarextension/CMakeLists.txt index 1313d9ac..f551b702 100644 --- a/kate/addons/kate/tabbarextension/CMakeLists.txt +++ b/kate/addons/kate/tabbarextension/CMakeLists.txt @@ -11,8 +11,8 @@ set(katetabbarextensionplugin_PART_SRCS kde4_add_plugin(katetabbarextensionplugin ${katetabbarextensionplugin_PART_SRCS}) target_link_libraries(katetabbarextensionplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KPARTS_LIBS} + KDE4::kdeui + KDE4::kparts kateinterfaces ) diff --git a/kate/addons/kate/tabify/CMakeLists.txt b/kate/addons/kate/tabify/CMakeLists.txt index edb45c00..dd4d5165 100644 --- a/kate/addons/kate/tabify/CMakeLists.txt +++ b/kate/addons/kate/tabify/CMakeLists.txt @@ -1,8 +1,8 @@ kde4_add_plugin(katetabifyplugin tabify.cpp) target_link_libraries(katetabifyplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KPARTS_LIBS} + KDE4::kdeui + KDE4::kparts kateinterfaces ) diff --git a/kate/addons/kate/textfilter/CMakeLists.txt b/kate/addons/kate/textfilter/CMakeLists.txt index 791df4b1..f11eddd4 100644 --- a/kate/addons/kate/textfilter/CMakeLists.txt +++ b/kate/addons/kate/textfilter/CMakeLists.txt @@ -3,8 +3,8 @@ kde4_add_plugin(katetextfilterplugin plugin_katetextfilter.cpp) target_link_libraries(katetextfilterplugin - ${KDE4_KDEUI_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdeui + KDE4::ktexteditor kateinterfaces ) diff --git a/kate/addons/ktexteditor/autobrace/CMakeLists.txt b/kate/addons/ktexteditor/autobrace/CMakeLists.txt index a31e7a68..4bc5ab55 100644 --- a/kate/addons/ktexteditor/autobrace/CMakeLists.txt +++ b/kate/addons/ktexteditor/autobrace/CMakeLists.txt @@ -12,8 +12,8 @@ set(ktexteditor_autobrace_PART_SRCS kde4_add_plugin(ktexteditor_autobrace ${ktexteditor_autobrace_PART_SRCS}) target_link_libraries(ktexteditor_autobrace - ${KDE4_KDECORE_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdecore + KDE4::ktexteditor ) install( diff --git a/kate/addons/ktexteditor/exporter/CMakeLists.txt b/kate/addons/ktexteditor/exporter/CMakeLists.txt index 3a7bb7e7..c538ab85 100644 --- a/kate/addons/ktexteditor/exporter/CMakeLists.txt +++ b/kate/addons/ktexteditor/exporter/CMakeLists.txt @@ -11,8 +11,8 @@ set(ktexteditor_exporter_PART_SRCS kde4_add_plugin(ktexteditor_exporter ${ktexteditor_exporter_PART_SRCS}) target_link_libraries(ktexteditor_exporter - ${KDE4_KDECORE_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdecore + KDE4::ktexteditor ) install( diff --git a/kate/addons/ktexteditor/hlselection/CMakeLists.txt b/kate/addons/ktexteditor/hlselection/CMakeLists.txt index a3da2ce0..b600667a 100644 --- a/kate/addons/ktexteditor/hlselection/CMakeLists.txt +++ b/kate/addons/ktexteditor/hlselection/CMakeLists.txt @@ -4,10 +4,10 @@ kde4_add_plugin(ktexteditor_hlselection hlselectionplugin.cpp) target_link_libraries(ktexteditor_hlselection - ${KDE4_KIO_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::kio + KDE4::ktexteditor + KDE4::kdeui + KDE4::kfile ) install( diff --git a/kate/addons/ktexteditor/insertfile/CMakeLists.txt b/kate/addons/ktexteditor/insertfile/CMakeLists.txt index b9a8305b..464c04f1 100644 --- a/kate/addons/ktexteditor/insertfile/CMakeLists.txt +++ b/kate/addons/ktexteditor/insertfile/CMakeLists.txt @@ -4,10 +4,10 @@ kde4_add_plugin(ktexteditor_insertfile insertfileplugin.cpp) target_link_libraries(ktexteditor_insertfile - ${KDE4_KIO_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::kio + KDE4::ktexteditor + KDE4::kdeui + KDE4::kfile ) install( diff --git a/kate/addons/ktexteditor/kte_iconinserter/CMakeLists.txt b/kate/addons/ktexteditor/kte_iconinserter/CMakeLists.txt index 93096594..a9e47163 100644 --- a/kate/addons/ktexteditor/kte_iconinserter/CMakeLists.txt +++ b/kate/addons/ktexteditor/kte_iconinserter/CMakeLists.txt @@ -1,8 +1,8 @@ kde4_add_plugin(ktexteditor_iconinserter iconinserterplugin.cpp) target_link_libraries(ktexteditor_iconinserter - ${KDE4_KDEUI_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdeui + KDE4::ktexteditor ) install( diff --git a/kate/addons/plasma/session/CMakeLists.txt b/kate/addons/plasma/session/CMakeLists.txt index c44b3507..505f2b17 100644 --- a/kate/addons/plasma/session/CMakeLists.txt +++ b/kate/addons/plasma/session/CMakeLists.txt @@ -3,8 +3,8 @@ project(katesessionapplet) kde4_add_plugin(plasma_applet_katesession katesessionapplet.cpp) target_link_libraries(plasma_applet_katesession - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio ) install( diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index 8d6db5a4..26331ebf 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -153,10 +153,10 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=13000) add_library(katepartinterfaces SHARED ${katepart_PART_SRCS}) target_link_libraries(katepartinterfaces - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdecore + KDE4::kparts + KDE4::kcmutils + KDE4::ktexteditor ) set_target_properties( @@ -178,10 +178,10 @@ kde4_add_plugin(katepart utils/katefactory.cpp) # link the part, use kate part interfaces + kde stuff target_link_libraries(katepart - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kdecore + KDE4::kparts + KDE4::kcmutils + KDE4::ktexteditor katepartinterfaces ) diff --git a/kate/src/app/CMakeLists.txt b/kate/src/app/CMakeLists.txt index 69ec7646..bbfb9999 100644 --- a/kate/src/app/CMakeLists.txt +++ b/kate/src/app/CMakeLists.txt @@ -30,8 +30,8 @@ add_library(kateinterfaces SHARED ${kateinterfaces_LIB_SRCS}) target_link_libraries(kateinterfaces PUBLIC ${QT_QTXML_LIBRARY} - ${KDE4_KTEXTEDITOR_LIBS} - ${KDE4_KPARTS_LIBS} + KDE4::ktexteditor + KDE4::kparts ) set_target_properties(kateinterfaces PROPERTIES @@ -45,7 +45,7 @@ add_executable(kate katemain.cpp) target_link_libraries(kate ${QT_QTGUI_LIBRARY} - ${KDE4_KDECORE_LIBS} + KDE4::kdecore kateinterfaces ) diff --git a/kate/src/filetree/CMakeLists.txt b/kate/src/filetree/CMakeLists.txt index a53113fc..83e959a0 100644 --- a/kate/src/filetree/CMakeLists.txt +++ b/kate/src/filetree/CMakeLists.txt @@ -14,9 +14,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) kde4_add_plugin(katefiletreeplugin ${katefiletreeplugin_PART_SRCS}) target_link_libraries(katefiletreeplugin - ${KDE4_KFILE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} + KDE4::kfile + KDE4::kparts + KDE4::ktexteditor kateinterfaces ) diff --git a/kate/tests/CMakeLists.txt b/kate/tests/CMakeLists.txt index 153188b3..e7bd2d32 100644 --- a/kate/tests/CMakeLists.txt +++ b/kate/tests/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ) set(KATE_TEST_LINK_LIBS - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ${QT_QTTEST_LIBRARY} - ${KDE4_KCMUTILS_LIBS} + KDE4::kcmutils ktexteditor katepartinterfaces ) @@ -32,7 +32,7 @@ target_link_libraries(kate-katetextbuffertest ${KATE_TEST_LINK_LIBS}) kde4_add_test(kate-range_test range_test.cpp) target_link_libraries(kate-range_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -78,7 +78,7 @@ target_link_libraries(kate-wordcompletion_test ${KATE_TEST_LINK_LIBS}) kde4_add_test(kate-searchbar_test searchbar_test.cpp) target_link_libraries(kate-searchbar_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -89,7 +89,7 @@ target_link_libraries(kate-searchbar_test kde4_add_test(kate-movingcursor_test movingcursor_test.cpp) target_link_libraries(kate-movingcursor_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -100,7 +100,7 @@ target_link_libraries(kate-movingcursor_test kde4_add_test(kate-movingrange_test movingrange_test.cpp) target_link_libraries(kate-movingrange_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -111,7 +111,7 @@ target_link_libraries(kate-movingrange_test kde4_add_test(kate-katedocument_test katedocument_test.cpp) target_link_libraries(kate-katedocument_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -122,7 +122,7 @@ target_link_libraries(kate-katedocument_test kde4_add_test(kate-kateview_test kateview_test.cpp) target_link_libraries(kate-kateview_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -133,7 +133,7 @@ target_link_libraries(kate-kateview_test kde4_add_test(kate-revision_test revision_test.cpp) target_link_libraries(kate-revision_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -145,7 +145,7 @@ kde4_add_test(kate-modificationsystem_test modificationsystem_test.cpp) target_link_libraries(kate-modificationsystem_test ${KATE_TEST_LINK_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -156,7 +156,7 @@ target_link_libraries(kate-modificationsystem_test kde4_add_test(kate-codefoldingtest katefoldingtest.cpp) target_link_libraries(kate-codefoldingtest - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -168,7 +168,7 @@ kde4_add_test(kate-bug286887_test bug286887.cpp) set_tests_properties(kate-bug286887_test PROPERTIES TIMEOUT 4) target_link_libraries(kate-bug286887_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -179,7 +179,7 @@ target_link_libraries(kate-bug286887_test kde4_add_test(kate-bug313769_test bug313769.cpp) target_link_libraries(kate-bug313769_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -190,7 +190,7 @@ target_link_libraries(kate-bug313769_test kde4_add_test(kate-documentcursor_test kte_documentcursor.cpp) target_link_libraries(kate-documentcursor_test - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces @@ -201,7 +201,7 @@ target_link_libraries(kate-documentcursor_test kde4_add_test(kate-messageinterface messagetest.cpp) target_link_libraries(kate-messageinterface - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${KATE_TEST_LINK_LIBS} katepartinterfaces diff --git a/kcminit/CMakeLists.txt b/kcminit/CMakeLists.txt index 25dd5b2b..8700e79e 100644 --- a/kcminit/CMakeLists.txt +++ b/kcminit/CMakeLists.txt @@ -5,8 +5,8 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=90250) add_executable(kcminit main.cpp) target_link_libraries(kcminit - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::kcmutils + KDE4::kdeui ${X11_LIBRARIES} ) diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt index 2de63b3c..725d08ae 100644 --- a/kcmshell/CMakeLists.txt +++ b/kcmshell/CMakeLists.txt @@ -3,8 +3,8 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=90220) add_executable(kcmshell4 main.cpp) target_link_libraries(kcmshell4 - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::kcmutils + KDE4::kdeui ) install( diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt index 89122314..9cb4c50f 100644 --- a/kcontrol/access/CMakeLists.txt +++ b/kcontrol/access/CMakeLists.txt @@ -3,8 +3,8 @@ kde4_add_plugin(kcm_access kcmaccess.cpp) target_link_libraries(kcm_access - ${KDE4_KIO_LIBS} - ${KDE4_KNOTIFYCONFIG_LIBS} + KDE4::kio + KDE4::knotifyconfig ${X11_LIBRARIES} ) @@ -24,7 +24,7 @@ set(kaccess_SRCS add_executable(kaccess ${kaccess_SRCS}) target_link_libraries(kaccess - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_LIBRARIES} ) diff --git a/kcontrol/autostart/CMakeLists.txt b/kcontrol/autostart/CMakeLists.txt index f17b6861..23a73f78 100644 --- a/kcontrol/autostart/CMakeLists.txt +++ b/kcontrol/autostart/CMakeLists.txt @@ -12,7 +12,7 @@ set(kcm_autostart_PART_SRCS kde4_add_plugin(kcm_autostart ${kcm_autostart_PART_SRCS}) -target_link_libraries(kcm_autostart ${KDE4_KIO_LIBS}) +target_link_libraries(kcm_autostart KDE4::kio) ########### install files ############### diff --git a/kcontrol/colors/CMakeLists.txt b/kcontrol/colors/CMakeLists.txt index 5f00f3b9..097bd64f 100644 --- a/kcontrol/colors/CMakeLists.txt +++ b/kcontrol/colors/CMakeLists.txt @@ -7,8 +7,8 @@ set(kcm_colors_PART_SRCS kde4_add_plugin(kcm_colors ${kcm_colors_PART_SRCS}) target_link_libraries(kcm_colors - ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::kio + KDE4::kdeui ${X11_LIBRARIES} ) diff --git a/kcontrol/componentchooser/CMakeLists.txt b/kcontrol/componentchooser/CMakeLists.txt index b16045c6..9800a4ea 100644 --- a/kcontrol/componentchooser/CMakeLists.txt +++ b/kcontrol/componentchooser/CMakeLists.txt @@ -27,8 +27,8 @@ endif() kde4_add_plugin(kcm_componentchooser ${kcm_componentchooser_SRCS}) target_link_libraries(kcm_componentchooser - ${KDE4_KIO_LIBS} - ${KDE4_KEMAIL_LIBS} + KDE4::kio + KDE4::kemail ) install( diff --git a/kcontrol/dateandtime/CMakeLists.txt b/kcontrol/dateandtime/CMakeLists.txt index 5a1dd6a8..a10c0eab 100644 --- a/kcontrol/dateandtime/CMakeLists.txt +++ b/kcontrol/dateandtime/CMakeLists.txt @@ -7,8 +7,8 @@ set(kcm_clock_PART_SRCS kde4_add_plugin(kcm_clock ${kcm_clock_PART_SRCS}) target_link_libraries(kcm_clock - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kio + KDE4::plasma ) install( @@ -20,7 +20,7 @@ install( add_executable(kcmdatetimehelper helper.cpp) -target_link_libraries(kcmdatetimehelper ${KDE4_KDECORE_LIBS}) +target_link_libraries(kcmdatetimehelper KDE4::kdecore) install( TARGETS kcmdatetimehelper diff --git a/kcontrol/desktoppaths/CMakeLists.txt b/kcontrol/desktoppaths/CMakeLists.txt index 4d754d76..060de406 100644 --- a/kcontrol/desktoppaths/CMakeLists.txt +++ b/kcontrol/desktoppaths/CMakeLists.txt @@ -6,8 +6,8 @@ set(kcm_desktoppaths_PART_SRCS kde4_add_plugin(kcm_desktoppaths ${kcm_desktoppaths_PART_SRCS}) target_link_libraries(kcm_desktoppaths - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kcmutils + KDE4::kio ) install( diff --git a/kcontrol/desktoptheme/CMakeLists.txt b/kcontrol/desktoptheme/CMakeLists.txt index 1c32f3ae..480521fd 100644 --- a/kcontrol/desktoptheme/CMakeLists.txt +++ b/kcontrol/desktoptheme/CMakeLists.txt @@ -9,12 +9,12 @@ set(kcmdesktoptheme_SRCS kde4_add_plugin(kcm_desktoptheme ${kcmdesktoptheme_SRCS}) target_link_libraries(kcm_desktoptheme ${X11_LIBRARIES} - ${KDE4_KDEUI_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KARCHIVE_LIBS} + KDE4::kdeui + KDE4::kparts + KDE4::kcmutils + KDE4::plasma + KDE4::kio + KDE4::karchive ) install( diff --git a/kcontrol/ebrowsing/CMakeLists.txt b/kcontrol/ebrowsing/CMakeLists.txt index 4b4e5236..30e261c9 100644 --- a/kcontrol/ebrowsing/CMakeLists.txt +++ b/kcontrol/ebrowsing/CMakeLists.txt @@ -1,7 +1,7 @@ kde4_add_plugin(kcm_kurifilt main.cpp) target_link_libraries(kcm_kurifilt - ${KDE4_KIO_LIBS} + KDE4::kio ) install( diff --git a/kcontrol/fonts/CMakeLists.txt b/kcontrol/fonts/CMakeLists.txt index df0606a1..61f17a88 100644 --- a/kcontrol/fonts/CMakeLists.txt +++ b/kcontrol/fonts/CMakeLists.txt @@ -20,7 +20,7 @@ endif(Q_WS_X11) kde4_add_plugin(kcm_fonts ${kcm_fonts_PART_SRCS}) target_link_libraries(kcm_fonts - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${FREETYPE_LIBRARIES} ${QT_QTXML_LIBRARY} ) diff --git a/kcontrol/hardware/display/CMakeLists.txt b/kcontrol/hardware/display/CMakeLists.txt index f788b3df..a82f9a94 100644 --- a/kcontrol/hardware/display/CMakeLists.txt +++ b/kcontrol/hardware/display/CMakeLists.txt @@ -3,9 +3,9 @@ kde4_add_plugin(kcm_display display.cpp) target_link_libraries(kcm_display - ${KDE4_KCMUTILS_LIBS} + KDE4::kcmutils ${QT_QTGUI_LIBRARY} - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ) install( diff --git a/kcontrol/hardware/joystick/CMakeLists.txt b/kcontrol/hardware/joystick/CMakeLists.txt index b690a0cf..c9dfe49e 100644 --- a/kcontrol/hardware/joystick/CMakeLists.txt +++ b/kcontrol/hardware/joystick/CMakeLists.txt @@ -11,8 +11,8 @@ set(kcm_joystick_PART_SRCS kde4_add_plugin(kcm_joystick ${kcm_joystick_PART_SRCS}) target_link_libraries(kcm_joystick - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdeui + KDE4::kio ${QT_QTGUI_LIBRARY} ) diff --git a/kcontrol/icons/CMakeLists.txt b/kcontrol/icons/CMakeLists.txt index b7be305d..beea4ede 100644 --- a/kcontrol/icons/CMakeLists.txt +++ b/kcontrol/icons/CMakeLists.txt @@ -13,8 +13,8 @@ set(kcm_icons_PART_SRCS kde4_add_plugin(kcm_icons ${kcm_icons_PART_SRCS}) target_link_libraries(kcm_icons - ${KDE4_KIO_LIBS} - ${KDE4_KARCHIVE_LIBS} + KDE4::kio + KDE4::karchive ${QT_QTGUI_LIBRARY} ) diff --git a/kcontrol/icons/tests/CMakeLists.txt b/kcontrol/icons/tests/CMakeLists.txt index ad77ecd9..e759d446 100644 --- a/kcontrol/icons/tests/CMakeLists.txt +++ b/kcontrol/icons/tests/CMakeLists.txt @@ -9,4 +9,4 @@ set(testicons_SRCS kde4_add_manual_test(testicons ${testicons_SRCS}) -target_link_libraries(testicons ${KDE4_KDEUI_LIBS}) +target_link_libraries(testicons KDE4::kdeui) diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index 056655cf..2b5fccbf 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -43,7 +43,7 @@ set(kapplymousetheme_SRCS kapplymousetheme.cpp ) add_executable(kapplymousetheme ${kapplymousetheme_SRCS}) target_link_libraries(kapplymousetheme - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_X11_LIB} ) if (X11_Xcursor_FOUND) @@ -63,7 +63,7 @@ set(kcm_input_PART_SRCS mouse.cpp main.cpp logitechmouse.cpp kmousedlg.ui logite kde4_add_plugin(kcm_input ${kcm_input_PART_SRCS}) -target_link_libraries(kcm_input ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kcm_input KDE4::kio ${X11_LIBRARIES}) if (LIBUSB_FOUND) target_link_libraries(kcm_input ${LIBUSB_LIBRARIES}) endif (LIBUSB_FOUND) @@ -85,8 +85,8 @@ kde4_add_plugin(kcm_cursortheme ${kcm_cursortheme_PART_SRCS}) target_link_libraries(kcm_cursortheme - ${KDE4_KIO_LIBS} - ${KDE4_KARCHIVE_LIBS} + KDE4::kio + KDE4::karchive ${X11_LIBRARIES} ) diff --git a/kcontrol/kdebug/CMakeLists.txt b/kcontrol/kdebug/CMakeLists.txt index 71accbbf..bbd45db7 100644 --- a/kcontrol/kdebug/CMakeLists.txt +++ b/kcontrol/kdebug/CMakeLists.txt @@ -7,7 +7,7 @@ set(kdebugconfig_SRCS kde4_add_plugin(kcm_kdebugconfig ${kdebugconfig_SRCS}) -target_link_libraries(kcm_kdebugconfig ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS}) +target_link_libraries(kcm_kdebugconfig KDE4::kdeui KDE4::kcmutils) install(TARGETS kcm_kdebugconfig DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kcontrol/kded/CMakeLists.txt b/kcontrol/kded/CMakeLists.txt index ccdcabaa..7d4c50c7 100644 --- a/kcontrol/kded/CMakeLists.txt +++ b/kcontrol/kded/CMakeLists.txt @@ -9,7 +9,7 @@ set(kcm_kded_PART_SRCS kcmkded.cpp ) kde4_add_plugin(kcm_kded ${kcm_kded_PART_SRCS}) -target_link_libraries(kcm_kded ${KDE4_KDEUI_LIBS}) +target_link_libraries(kcm_kded KDE4::kdeui) install(TARGETS kcm_kded DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeLists.txt index 0d1e5753..b7b218e6 100644 --- a/kcontrol/keyboard/CMakeLists.txt +++ b/kcontrol/keyboard/CMakeLists.txt @@ -27,9 +27,9 @@ set(kded_keyboard_SRCS kde4_add_plugin(kded_keyboard ${kded_keyboard_SRCS}) target_link_libraries(kded_keyboard - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdecore + KDE4::kdeui + KDE4::plasma ${QT_QTXML_LIBRARY} ${X11_LIBRARIES} ${X11_Xkbfile_LIB} @@ -62,8 +62,8 @@ set( plasma_applet_keyboard_SRCS kde4_add_plugin(plasma_applet_keyboard ${plasma_applet_keyboard_SRCS}) target_link_libraries(plasma_applet_keyboard - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${QT_QTXML_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} @@ -87,8 +87,8 @@ set( keyboard_layout_widget_SRCS kde4_add_plugin(keyboard_layout_widget ${keyboard_layout_widget_SRCS}) target_link_libraries(keyboard_layout_widget - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${QT_QTXML_LIBRARY} ${X11_LIBRARIES} ${X11_Xkbfile_LIB} @@ -128,8 +128,8 @@ set(kcm_keyboard_PART_SRCS kde4_add_plugin(kcm_keyboard ${kcm_keyboard_PART_SRCS}) target_link_libraries(kcm_keyboard - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ) diff --git a/kcontrol/keyboard/tests/CMakeLists.txt b/kcontrol/keyboard/tests/CMakeLists.txt index 04862afa..c0d3520f 100644 --- a/kcontrol/keyboard/tests/CMakeLists.txt +++ b/kcontrol/keyboard/tests/CMakeLists.txt @@ -1,7 +1,7 @@ macro(KEYBOARD_DAEMON_UNIT_TESTS _testname) kde4_add_test(kcm-keyboard-${_testname} ${_testname}_test.cpp ../${_testname}.cpp) target_link_libraries(kcm-keyboard-${_testname} - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} @@ -18,7 +18,7 @@ macro(KEYBOARD_DAEMON_UNIT_TESTS2 _testname _src1 _src2 _src3) ../${_src3} ) target_link_libraries(kcm-keyboard-${_testname} - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} @@ -37,8 +37,8 @@ kde4_add_test(kcm-keyboard-flags_test ../xkb_rules.cpp ) target_link_libraries(kcm-keyboard-flags_test - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} @@ -68,8 +68,8 @@ if(X11_XTest_FOUND) ../numlockx.c ) target_link_libraries(kcm-keyboard-keyboard_daemon_test - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt index d541edd1..afdcc51b 100644 --- a/kcontrol/keys/CMakeLists.txt +++ b/kcontrol/keys/CMakeLists.txt @@ -21,7 +21,7 @@ set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES INCLUDE "kg qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_component_xml} kglobalaccel_component_interface ) kde4_add_plugin(kcm_keys ${kcm_keys_PART_SRCS}) -target_link_libraries(kcm_keys ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB}) +target_link_libraries(kcm_keys KDE4::kdeui KDE4::kio ${X11_X11_LIB}) install(TARGETS kcm_keys DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/kio/CMakeLists.txt index c0b005b7..47f6db17 100644 --- a/kcontrol/kio/CMakeLists.txt +++ b/kcontrol/kio/CMakeLists.txt @@ -20,8 +20,8 @@ set_source_files_properties( kde4_add_plugin(kcm_kio ${kcm_kio_PART_SRCS}) target_link_libraries(kcm_kio - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kcmutils + KDE4::kio ) install( diff --git a/kcontrol/kmetainfo/CMakeLists.txt b/kcontrol/kmetainfo/CMakeLists.txt index ee89379e..c726d0f0 100644 --- a/kcontrol/kmetainfo/CMakeLists.txt +++ b/kcontrol/kmetainfo/CMakeLists.txt @@ -8,9 +8,9 @@ set(kmetainfoconfig_SRCS kde4_add_plugin(kcm_kmetainfoconfig ${kmetainfoconfig_SRCS}) target_link_libraries(kcm_kmetainfoconfig - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdeui + KDE4::kcmutils + KDE4::kio ) install( diff --git a/kcontrol/knotify/CMakeLists.txt b/kcontrol/knotify/CMakeLists.txt index d442bfdb..d0e127a5 100644 --- a/kcontrol/knotify/CMakeLists.txt +++ b/kcontrol/knotify/CMakeLists.txt @@ -5,7 +5,7 @@ set(kcm_knotify_PART_SRCS knotify.cpp playersettings.ui ) kde4_add_plugin(kcm_knotify ${kcm_knotify_PART_SRCS}) -target_link_libraries(kcm_knotify ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kcm_knotify KDE4::kio KDE4::knotifyconfig ${QT_QTGUI_LIBRARY}) install(TARGETS kcm_knotify DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kcontrol/kpasswdstore/CMakeLists.txt b/kcontrol/kpasswdstore/CMakeLists.txt index 908e346c..e5f64182 100644 --- a/kcontrol/kpasswdstore/CMakeLists.txt +++ b/kcontrol/kpasswdstore/CMakeLists.txt @@ -8,8 +8,8 @@ set(kpasswdstoreconfig_SRCS kde4_add_plugin(kcm_kpasswdstoreconfig ${kpasswdstoreconfig_SRCS}) target_link_libraries(kcm_kpasswdstoreconfig - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kdeui + KDE4::kcmutils ) install( diff --git a/kcontrol/launch/CMakeLists.txt b/kcontrol/launch/CMakeLists.txt index 421e66ff..ffcca19c 100644 --- a/kcontrol/launch/CMakeLists.txt +++ b/kcontrol/launch/CMakeLists.txt @@ -16,7 +16,7 @@ QT4_ADD_DBUS_INTERFACE( kcm_launch_PART_SRCS ${kwin_xml} kwin_interface ) kde4_add_plugin(kcm_launch ${kcm_launch_PART_SRCS}) -target_link_libraries(kcm_launch ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kcm_launch KDE4::kdeui ${QT_QTGUI_LIBRARY}) install(TARGETS kcm_launch DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt index 5c789879..84270277 100644 --- a/kcontrol/locale/CMakeLists.txt +++ b/kcontrol/locale/CMakeLists.txt @@ -7,7 +7,7 @@ set(kcm_locale_PART_SRCS kcmlocale.cpp ) kde4_add_plugin(kcm_locale ${kcm_locale_PART_SRCS}) -target_link_libraries(kcm_locale ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ) +target_link_libraries(kcm_locale KDE4::kio ${QT_QTGUI_LIBRARY} ) install(TARGETS kcm_locale DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/mediaplayer/CMakeLists.txt b/kcontrol/mediaplayer/CMakeLists.txt index ca13a8e0..5fabcf45 100644 --- a/kcontrol/mediaplayer/CMakeLists.txt +++ b/kcontrol/mediaplayer/CMakeLists.txt @@ -4,7 +4,7 @@ kde4_add_plugin(kcm_kmediaplayer kcmplayer.cpp) target_link_libraries(kcm_kmediaplayer - ${KDE4_KIO_LIBS} + KDE4::kio KDE4::kmediaplayer ) diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 811d0860..4067e85e 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -30,7 +30,7 @@ set(kcm_randr_PART_SRCS kde4_add_plugin(kcm_randr ${kcm_randr_PART_SRCS}) target_link_libraries(kcm_randr - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_Xrandr_LIB} ${X11_LIBRARIES} ) @@ -53,7 +53,7 @@ set(krandrtray_SRCS add_executable(krandrtray ${krandrtray_SRCS}) target_link_libraries(krandrtray - ${KDE4_KCMUTILS_LIBS} + KDE4::kcmutils ${X11_Xrandr_LIB} ${X11_LIBRARIES} ) diff --git a/kcontrol/randr/module/CMakeLists.txt b/kcontrol/randr/module/CMakeLists.txt index 4e63c06a..ae9f7af8 100644 --- a/kcontrol/randr/module/CMakeLists.txt +++ b/kcontrol/randr/module/CMakeLists.txt @@ -19,8 +19,8 @@ set(kded_randrmonitor_PART_SRCS kde4_add_plugin(kded_randrmonitor ${kded_randrmonitor_PART_SRCS}) target_link_libraries(kded_randrmonitor - ${KDE4_KDEUI_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kdeui + KDE4::solid ${X11_Xrandr_LIB} ${X11_LIBRARIES} ) diff --git a/kcontrol/spellchecking/CMakeLists.txt b/kcontrol/spellchecking/CMakeLists.txt index 67ebaf00..b3f7a0cb 100644 --- a/kcontrol/spellchecking/CMakeLists.txt +++ b/kcontrol/spellchecking/CMakeLists.txt @@ -4,7 +4,7 @@ SET(kcm_spellchecking_SRCS KDE4_ADD_PLUGIN(kcm_spellchecking ${kcm_spellchecking_SRCS}) -TARGET_LINK_LIBRARIES(kcm_spellchecking ${KDE4_KDEUI_LIBS}) +TARGET_LINK_LIBRARIES(kcm_spellchecking KDE4::kdeui) INSTALL(TARGETS kcm_spellchecking diff --git a/kcontrol/standard_actions/CMakeLists.txt b/kcontrol/standard_actions/CMakeLists.txt index d29eadce..954c1f19 100644 --- a/kcontrol/standard_actions/CMakeLists.txt +++ b/kcontrol/standard_actions/CMakeLists.txt @@ -2,7 +2,7 @@ set(kcm_standard_actions_PART_SRCS standard_actions_module.cpp) kde4_add_plugin(kcm_standard_actions ${kcm_standard_actions_PART_SRCS}) -target_link_libraries(kcm_standard_actions ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB}) +target_link_libraries(kcm_standard_actions KDE4::kdeui KDE4::kio ${X11_X11_LIB}) install(TARGETS kcm_standard_actions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES standard_actions.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/style/CMakeLists.txt b/kcontrol/style/CMakeLists.txt index 31606577..d6845d8a 100644 --- a/kcontrol/style/CMakeLists.txt +++ b/kcontrol/style/CMakeLists.txt @@ -17,8 +17,8 @@ set(kcm_style_PART_SRCS kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS}) -target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES} - ${KDE4_PLASMA_LIBS}) +target_link_libraries(kcm_style KDE4::kio ${X11_LIBRARIES} + KDE4::plasma) target_link_libraries(kcm_style kdecorations) install(TARGETS kcm_style DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kcontrol/workspaceoptions/CMakeLists.txt b/kcontrol/workspaceoptions/CMakeLists.txt index 00b30010..163884fa 100644 --- a/kcontrol/workspaceoptions/CMakeLists.txt +++ b/kcontrol/workspaceoptions/CMakeLists.txt @@ -4,7 +4,7 @@ set(kcm_workspaceoptions_PART_SRCS workspaceoptions.cpp mainpage.ui) kde4_add_plugin(kcm_workspaceoptions ${kcm_workspaceoptions_PART_SRCS}) -target_link_libraries(kcm_workspaceoptions ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ) +target_link_libraries(kcm_workspaceoptions KDE4::kdeui KDE4::kio ) install(TARGETS kcm_workspaceoptions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kde-menu/CMakeLists.txt b/kde-menu/CMakeLists.txt index d18357ff..eafa380c 100644 --- a/kde-menu/CMakeLists.txt +++ b/kde-menu/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(kde4-menu kde-menu.cpp) -target_link_libraries(kde4-menu ${KDE4_KDECORE_LIBS}) +target_link_libraries(kde4-menu KDE4::kdecore) install( TARGETS kde4-menu diff --git a/kdepasswd/CMakeLists.txt b/kdepasswd/CMakeLists.txt index ed062767..7ec920ee 100644 --- a/kdepasswd/CMakeLists.txt +++ b/kdepasswd/CMakeLists.txt @@ -15,8 +15,8 @@ set(kdepasswd_SRCS add_executable(kdepasswd ${kdepasswd_SRCS}) target_link_libraries(kdepasswd - ${KDE4_KIO_LIBS} - ${KDE4_KPTY_LIBS} + KDE4::kio + KDE4::kpty ) install( diff --git a/kdepasswd/kcm/CMakeLists.txt b/kdepasswd/kcm/CMakeLists.txt index d398f62b..b4e8d337 100644 --- a/kdepasswd/kcm/CMakeLists.txt +++ b/kdepasswd/kcm/CMakeLists.txt @@ -12,9 +12,8 @@ kde4_add_kcfg_files(kcm_useraccount_PART_SRCS settings.kcfgc pass.kcfgc) kde4_add_plugin(kcm_useraccount ${kcm_useraccount_PART_SRCS}) target_link_libraries(kcm_useraccount - ${KDE4_KIO_LIBS} - ${KDE4_KEMAIL_LIBS} - ${KDE4_KDESU_LIBS} + KDE4::kio + KDE4::kemail konq ) diff --git a/kdesudo/CMakeLists.txt b/kdesudo/CMakeLists.txt index 1339bddf..517bfc97 100644 --- a/kdesudo/CMakeLists.txt +++ b/kdesudo/CMakeLists.txt @@ -22,7 +22,7 @@ set(KDESUDO_SRC add_executable(kdesudo ${KDESUDO_SRC}) target_link_libraries(kdesudo - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ) install( diff --git a/kdialog/CMakeLists.txt b/kdialog/CMakeLists.txt index 95b5ebbb..3fad8536 100644 --- a/kdialog/CMakeLists.txt +++ b/kdialog/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable(kdialog ${kdialog_SRCS}) # Need libkfile due to the code that adjusts the geometry of the KDirSelectDialog target_link_libraries(kdialog - ${KDE4_KFILE_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kfile + KDE4::kio ) if(Q_WS_X11) diff --git a/kdirshare/filepropertiesplugin/CMakeLists.txt b/kdirshare/filepropertiesplugin/CMakeLists.txt index 704c6a40..b22c1f8f 100644 --- a/kdirshare/filepropertiesplugin/CMakeLists.txt +++ b/kdirshare/filepropertiesplugin/CMakeLists.txt @@ -7,8 +7,8 @@ set(kdirshareplugin_PART_SRCS kde4_add_plugin(kdirshareplugin ${kdirshareplugin_PART_SRCS}) target_link_libraries(kdirshareplugin - ${KDE4_KIO_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kio + KDE4::kio ${QT_QTDBUS_LIBRARY} ) diff --git a/kdirshare/kded/CMakeLists.txt b/kdirshare/kded/CMakeLists.txt index 130460fb..6ab3f95d 100644 --- a/kdirshare/kded/CMakeLists.txt +++ b/kdirshare/kded/CMakeLists.txt @@ -10,11 +10,11 @@ qt4_generate_dbus_interface(kded_kdirshare.h org.kde.kdirshare.xml ) kde4_add_plugin(kded_kdirshare ${kded_kdirshare_SRCS}) target_link_libraries(kded_kdirshare PRIVATE - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KDNSSD_LIBS} - ${KDE4_KPASSWDSTORE_LIBS} + KDE4::kdecore + KDE4::kdeui + KDE4::kio + KDE4::kdnssd + KDE4::kpasswdstore ) if(OPENSSL_FOUND) diff --git a/kdontchangethehostname/CMakeLists.txt b/kdontchangethehostname/CMakeLists.txt index c1849222..0b8247b9 100644 --- a/kdontchangethehostname/CMakeLists.txt +++ b/kdontchangethehostname/CMakeLists.txt @@ -1,7 +1,7 @@ set(kdontchangethehostname_SRCS khostname.cpp ) add_executable(kdontchangethehostname ${kdontchangethehostname_SRCS}) -target_link_libraries(kdontchangethehostname ${KDE4_KDECORE_LIBS}) +target_link_libraries(kdontchangethehostname KDE4::kdecore) install( TARGETS kdontchangethehostname diff --git a/keditbookmarks/CMakeLists.txt b/keditbookmarks/CMakeLists.txt index cbe307db..6d6eb43f 100644 --- a/keditbookmarks/CMakeLists.txt +++ b/keditbookmarks/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(kbookmarkmodel) add_executable(kbookmarkmerger kbookmarkmerger.cpp) -target_link_libraries(kbookmarkmerger ${KDE4_KIO_LIBS}) +target_link_libraries(kbookmarkmerger KDE4::kio) install( TARGETS kbookmarkmerger @@ -50,7 +50,7 @@ kde4_add_kcfg_files(keditbookmarks_SRCS settings.kcfgc) add_executable(keditbookmarks ${keditbookmarks_SRCS}) target_link_libraries(keditbookmarks - ${KDE4_KPARTS_LIBS} + KDE4::kparts kbookmarkmodel_private konq ) diff --git a/keditbookmarks/kbookmarkmodel/CMakeLists.txt b/keditbookmarks/kbookmarkmodel/CMakeLists.txt index d2975599..18d8e5fb 100644 --- a/keditbookmarks/kbookmarkmodel/CMakeLists.txt +++ b/keditbookmarks/kbookmarkmodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(kbookmarkmodel_SRCS add_library(kbookmarkmodel_private SHARED ${kbookmarkmodel_SRCS}) target_link_libraries(kbookmarkmodel_private - ${KDE4_KIO_LIBS} + KDE4::kio ) set_target_properties(kbookmarkmodel_private PROPERTIES diff --git a/keditbookmarks/kbookmarkmodel/tests/CMakeLists.txt b/keditbookmarks/kbookmarkmodel/tests/CMakeLists.txt index 0cd6e3f6..6e2d19c9 100644 --- a/keditbookmarks/kbookmarkmodel/tests/CMakeLists.txt +++ b/keditbookmarks/kbookmarkmodel/tests/CMakeLists.txt @@ -7,6 +7,6 @@ include_directories( kde4_add_test(kbookmarkmodeltest kbookmarkmodeltest.cpp) target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTTEST_LIBRARY} ) diff --git a/keditfiletype/CMakeLists.txt b/keditfiletype/CMakeLists.txt index 979feebf..b0c19fc3 100644 --- a/keditfiletype/CMakeLists.txt +++ b/keditfiletype/CMakeLists.txt @@ -19,7 +19,7 @@ set(kcm_filetypes_SRCS filetypesview.cpp ${libfiletypes_SRCS}) kde4_add_plugin(kcm_filetypes ${kcm_filetypes_SRCS}) -target_link_libraries(kcm_filetypes ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kcm_filetypes KDE4::kdeui KDE4::kio) install( TARGETS kcm_filetypes @@ -33,7 +33,7 @@ set(keditfiletype_SRCS keditfiletype.cpp ${libfiletypes_SRCS}) add_executable(keditfiletype ${keditfiletype_SRCS}) target_link_libraries(keditfiletype - ${KDE4_KIO_LIBS} + KDE4::kio ${X11_X11_LIB} ) diff --git a/keditfiletype/tests/CMakeLists.txt b/keditfiletype/tests/CMakeLists.txt index 49067a60..9444b9d1 100644 --- a/keditfiletype/tests/CMakeLists.txt +++ b/keditfiletype/tests/CMakeLists.txt @@ -8,9 +8,9 @@ kde4_add_test(keditfiletype-filetypestest ../mimetypewriter.cpp ) target_link_libraries(keditfiletype-filetypestest - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::kdecore + KDE4::kio + KDE4::kdeui ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt index d26d5cd5..2a7f0bcb 100644 --- a/kfile/CMakeLists.txt +++ b/kfile/CMakeLists.txt @@ -2,7 +2,7 @@ set(kfile_SRCS kfile.cpp) add_executable(kfile4 ${kfile_SRCS}) -target_link_libraries(kfile4 ${KDE4_KIO_LIBS}) +target_link_libraries(kfile4 KDE4::kio) install( TARGETS kfile4 diff --git a/kfind/CMakeLists.txt b/kfind/CMakeLists.txt index 9b0af570..6df9a4ea 100644 --- a/kfind/CMakeLists.txt +++ b/kfind/CMakeLists.txt @@ -15,8 +15,8 @@ set(kfind_SRCS add_executable(kfind ${kfind_SRCS}) target_link_libraries(kfind - ${KDE4_KFILE_LIBS} - ${KDE4_KARCHIVE_LIBS} + KDE4::kfile + KDE4::karchive konq ) diff --git a/kfreespace/kcm/CMakeLists.txt b/kfreespace/kcm/CMakeLists.txt index 6a59bcbb..b873d38c 100644 --- a/kfreespace/kcm/CMakeLists.txt +++ b/kfreespace/kcm/CMakeLists.txt @@ -7,9 +7,9 @@ set(kfreespaceconfig_SRCS kde4_add_plugin(kcm_kfreespaceconfig ${kfreespaceconfig_SRCS}) target_link_libraries(kcm_kfreespaceconfig - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kdeui + KDE4::kcmutils + KDE4::solid ) install( diff --git a/kfreespace/kded/CMakeLists.txt b/kfreespace/kded/CMakeLists.txt index 45ff9d52..9f13fae6 100644 --- a/kfreespace/kded/CMakeLists.txt +++ b/kfreespace/kded/CMakeLists.txt @@ -10,10 +10,10 @@ qt4_generate_dbus_interface(kded_kfreespace.h org.kde.kfreespace.xml ) kde4_add_plugin(kded_kfreespace ${kded_kfreespace_SRCS}) target_link_libraries(kded_kfreespace PRIVATE - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kdecore + KDE4::kdeui + KDE4::kio + KDE4::solid ) install( diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt index c643846e..166a2d28 100644 --- a/kglobalaccel/CMakeLists.txt +++ b/kglobalaccel/CMakeLists.txt @@ -21,8 +21,8 @@ set(kglobalaccel_SRCS add_executable(kglobalaccel ${kglobalaccel_SRCS}) target_link_libraries(kglobalaccel - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdeui + KDE4::kio ${X11_LIBRARIES} ) diff --git a/kgreeter/CMakeLists.txt b/kgreeter/CMakeLists.txt index 776f29db..ba536126 100644 --- a/kgreeter/CMakeLists.txt +++ b/kgreeter/CMakeLists.txt @@ -29,8 +29,8 @@ add_executable(lightdm-kgreeter-greeter kgreeter.cpp) target_link_libraries(lightdm-kgreeter-greeter ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${LIGHTDM_LIBRARIES} ${GLIB2_LIBRARIES} ) diff --git a/kgreeter/kcm/CMakeLists.txt b/kgreeter/kcm/CMakeLists.txt index 50003d68..ae1cd671 100644 --- a/kgreeter/kcm/CMakeLists.txt +++ b/kgreeter/kcm/CMakeLists.txt @@ -8,9 +8,9 @@ set(kgreeterconfig_SRCS kde4_add_plugin(kcm_kgreeterconfig ${kgreeterconfig_SRCS}) target_link_libraries(kcm_kgreeterconfig - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::kcmutils + KDE4::plasma ) install( @@ -26,7 +26,7 @@ install( ########### next target ############### add_executable(kcmkgreeterhelper kgreeterhelper.cpp) -target_link_libraries(kcmkgreeterhelper ${KDE4_KDECORE_LIBS}) +target_link_libraries(kcmkgreeterhelper KDE4::kdecore) install( TARGETS kcmkgreeterhelper diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt index 8cca19cc..cf48115c 100644 --- a/khotkeys/app/CMakeLists.txt +++ b/khotkeys/app/CMakeLists.txt @@ -8,7 +8,7 @@ qt4_generate_dbus_interface(kded.h org.kde.khotkeys.xml ) kde4_add_plugin(kded_khotkeys ${kded_khotkeys_PART_SRCS}) target_link_libraries(kded_khotkeys - ${KDE4_KDEUI_LIBS} + KDE4::kdeui # I'm not sure if this is needed anymore. Check it ${X11_XTest_LIB} khotkeysprivate diff --git a/khotkeys/kcm_hotkeys/CMakeLists.txt b/khotkeys/kcm_hotkeys/CMakeLists.txt index b7d5bdd9..469e9c00 100644 --- a/khotkeys/kcm_hotkeys/CMakeLists.txt +++ b/khotkeys/kcm_hotkeys/CMakeLists.txt @@ -73,7 +73,7 @@ kde4_add_plugin(kcm_hotkeys ${kcm_hotkeys_PART_SRCS}) add_dependencies(kcm_hotkeys kded_khotkeys) target_link_libraries(kcm_hotkeys - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} khotkeysprivate diff --git a/khotkeys/libkhotkeysprivate/CMakeLists.txt b/khotkeys/libkhotkeysprivate/CMakeLists.txt index 37a77052..47844168 100644 --- a/khotkeys/libkhotkeysprivate/CMakeLists.txt +++ b/khotkeys/libkhotkeysprivate/CMakeLists.txt @@ -63,7 +63,7 @@ set(khotkeysprivate_SRCS add_library(khotkeysprivate SHARED ${khotkeysprivate_SRCS}) target_link_libraries(khotkeysprivate - ${KDE4_KIO_LIBS} + KDE4::kio ${X11_LIBRARIES} kworkspace ) diff --git a/khotkeys/test/CMakeLists.txt b/khotkeys/test/CMakeLists.txt index 9e360390..f8d1e5e3 100644 --- a/khotkeys/test/CMakeLists.txt +++ b/khotkeys/test/CMakeLists.txt @@ -1,7 +1,7 @@ MACRO(KHOTKEYS_UNIT_TESTS) FOREACH(_testname ${ARGN}) kde4_add_test(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} khotkeysprivate ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(${_testname} khotkeysprivate KDE4::kdecore ${QT_QTTEST_LIBRARY}) ENDFOREACH(_testname) ENDMACRO(KHOTKEYS_UNIT_TESTS) diff --git a/kiconfinder/CMakeLists.txt b/kiconfinder/CMakeLists.txt index 77048709..d44f0b75 100644 --- a/kiconfinder/CMakeLists.txt +++ b/kiconfinder/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(kiconfinder kiconfinder.cpp) -target_link_libraries(kiconfinder ${KDE4_KDEUI_LIBS}) +target_link_libraries(kiconfinder KDE4::kdeui) install( TARGETS kiconfinder diff --git a/kinfocenter/CMakeLists.txt b/kinfocenter/CMakeLists.txt index 507a08a8..bbea8d03 100644 --- a/kinfocenter/CMakeLists.txt +++ b/kinfocenter/CMakeLists.txt @@ -49,8 +49,8 @@ set( kinfocenter_SRCS add_executable(kinfocenter ${kinfocenter_SRCS} ) target_link_libraries(kinfocenter - ${KDE4_KFILE_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kfile + KDE4::kcmutils ) ##install diff --git a/kinfocenter/Modules/devinfo/CMakeLists.txt b/kinfocenter/Modules/devinfo/CMakeLists.txt index 14703f99..f2348912 100644 --- a/kinfocenter/Modules/devinfo/CMakeLists.txt +++ b/kinfocenter/Modules/devinfo/CMakeLists.txt @@ -3,7 +3,7 @@ project( devinfo ) set( devinfoSources soldevice.cpp devinfo.cpp devicelisting.cpp infopanel.cpp soldevicetypes.cpp qvlistlayout.cpp solidhelper.cpp) kde4_add_plugin( devinfo ${devinfoSources} ) -target_link_libraries( devinfo ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries( devinfo KDE4::kio KDE4::solid) install( TARGETS devinfo DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES devinfo.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/info/CMakeLists.txt b/kinfocenter/Modules/info/CMakeLists.txt index c45b2096..b2ec0db1 100644 --- a/kinfocenter/Modules/info/CMakeLists.txt +++ b/kinfocenter/Modules/info/CMakeLists.txt @@ -13,7 +13,7 @@ set(kcm_info_PART_SRCS main.cpp info.cpp ../base/os_current.cpp) kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS}) -target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB}) +target_link_libraries(kcm_info KDE4::kdeui ${QT_QTGUI_LIBRARY} ${X11_X11_LIB}) if(DEVINFO_LIBRARY) target_link_libraries(kcm_info ${DEVINFO_LIBRARY}) diff --git a/kinfocenter/Modules/infosummary/CMakeLists.txt b/kinfocenter/Modules/infosummary/CMakeLists.txt index fc87b898..b08155d1 100644 --- a/kinfocenter/Modules/infosummary/CMakeLists.txt +++ b/kinfocenter/Modules/infosummary/CMakeLists.txt @@ -2,7 +2,7 @@ set( infosummarySources infosum.cpp defaultboxwidget.cpp progressboxwidget.cpp osdepinfo.cpp) kde4_add_plugin( kcm_infosummary ${infosummarySources} ) -target_link_libraries( kcm_infosummary ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ) +target_link_libraries( kcm_infosummary KDE4::kio KDE4::solid ) install( TARGETS kcm_infosummary DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES kcm_infosummary.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/kernel/CMakeLists.txt b/kinfocenter/Modules/kernel/CMakeLists.txt index 753c51bc..12770f63 100644 --- a/kinfocenter/Modules/kernel/CMakeLists.txt +++ b/kinfocenter/Modules/kernel/CMakeLists.txt @@ -7,7 +7,7 @@ set(kcm_kernel_PART_SRCS kernel.cpp ) kde4_add_plugin(kcm_kernel ${kcm_kernel_PART_SRCS}) target_link_libraries(kcm_kernel - ${KDE4_KIO_LIBS} + KDE4::kio ${KMOD_LIBRARIES} ) diff --git a/kinfocenter/Modules/memory/CMakeLists.txt b/kinfocenter/Modules/memory/CMakeLists.txt index 2fb2097f..341dff1d 100644 --- a/kinfocenter/Modules/memory/CMakeLists.txt +++ b/kinfocenter/Modules/memory/CMakeLists.txt @@ -5,7 +5,7 @@ set(KCM_MEMORY_PART_SRCS memory.cpp chartWidget.cpp totalMemoryChart.cpp physica kde4_add_plugin(kcm_memory ${KCM_MEMORY_PART_SRCS}) -target_link_libraries(kcm_memory ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kcm_memory KDE4::kdeui ${QT_QTGUI_LIBRARY}) if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") target_link_libraries(kcm_memory kvm) diff --git a/kinfocenter/Modules/nics/CMakeLists.txt b/kinfocenter/Modules/nics/CMakeLists.txt index 071570bb..c9d97908 100644 --- a/kinfocenter/Modules/nics/CMakeLists.txt +++ b/kinfocenter/Modules/nics/CMakeLists.txt @@ -5,7 +5,7 @@ set(kcm_nic_PART_SRCS nic.cpp ) kde4_add_plugin(kcm_nic ${kcm_nic_PART_SRCS}) target_link_libraries(kcm_nic - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTNETWORK_LIBRARY} ) diff --git a/kinfocenter/Modules/opengl/CMakeLists.txt b/kinfocenter/Modules/opengl/CMakeLists.txt index 5593463c..7146a8f5 100644 --- a/kinfocenter/Modules/opengl/CMakeLists.txt +++ b/kinfocenter/Modules/opengl/CMakeLists.txt @@ -17,7 +17,7 @@ endif() kde4_add_plugin(kcm_opengl opengl.cpp) -target_link_libraries(kcm_opengl ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB}) +target_link_libraries(kcm_opengl KDE4::kdeui ${QT_QTGUI_LIBRARY} ${X11_X11_LIB}) if(LIBDRM_FOUND) target_link_libraries(kcm_opengl ${LIBDRM_LIBRARIES}) diff --git a/kinfocenter/Modules/pci/CMakeLists.txt b/kinfocenter/Modules/pci/CMakeLists.txt index 2c489b4e..d74f683e 100644 --- a/kinfocenter/Modules/pci/CMakeLists.txt +++ b/kinfocenter/Modules/pci/CMakeLists.txt @@ -16,7 +16,7 @@ if(PCIUTILS_FOUND) kde4_add_plugin(kcm_pci ${KCM_PCI_PART_SRCS}) - target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${PCIUTILS_LIBRARIES}) + target_link_libraries(kcm_pci KDE4::kdeui ${QT_QTGUI_LIBRARY} ${PCIUTILS_LIBRARIES}) else(PCIUTILS_FOUND) @@ -25,7 +25,7 @@ else(PCIUTILS_FOUND) kde4_add_plugin(kcm_pci ${KCM_PCI_PART_SRCS}) - target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ) + target_link_libraries(kcm_pci KDE4::kdeui ${QT_QTGUI_LIBRARY} ) endif(PCIUTILS_FOUND) install(TARGETS kcm_pci DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kinfocenter/Modules/usbview/CMakeLists.txt b/kinfocenter/Modules/usbview/CMakeLists.txt index 0b3e3559..6b8c0d56 100644 --- a/kinfocenter/Modules/usbview/CMakeLists.txt +++ b/kinfocenter/Modules/usbview/CMakeLists.txt @@ -6,7 +6,7 @@ set(kcm_usb_PART_SRCS kcmusb.cpp usbdevices.cpp ) kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS}) target_link_libraries(kcm_usb - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTGUI_LIBRARY} ) diff --git a/kinfocenter/Modules/view1394/CMakeLists.txt b/kinfocenter/Modules/view1394/CMakeLists.txt index 89894c2c..0496dae3 100644 --- a/kinfocenter/Modules/view1394/CMakeLists.txt +++ b/kinfocenter/Modules/view1394/CMakeLists.txt @@ -4,7 +4,7 @@ set(kcm_view1394_PART_SRCS view1394.cpp view1394widget.ui) kde4_add_plugin(kcm_view1394 ${kcm_view1394_PART_SRCS}) -target_link_libraries(kcm_view1394 ${KDE4_KDEUI_LIBS} ${RAW1394_LIBRARIES}) +target_link_libraries(kcm_view1394 KDE4::kdeui ${RAW1394_LIBRARIES}) install(TARGETS kcm_view1394 DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kioclient/CMakeLists.txt b/kioclient/CMakeLists.txt index 098a876d..ec16e2ac 100644 --- a/kioclient/CMakeLists.txt +++ b/kioclient/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=101) set(kioclient_SRCS kioclient.cpp ) add_executable(kioclient ${kioclient_SRCS}) target_compile_definitions(kioclient PRIVATE -DKIOCLIENT_AS_KIOCLIENT) -target_link_libraries(kioclient ${KDE4_KIO_LIBS}) +target_link_libraries(kioclient KDE4::kio) install( TARGETS kioclient DESTINATION ${KDE4_BIN_INSTALL_DIR} @@ -14,7 +14,7 @@ install( set(kde-open_SRCS kioclient.cpp ) add_executable(kde-open ${kde-open_SRCS}) target_compile_definitions(kde-open PRIVATE -DKIOCLIENT_AS_KDEOPEN) -target_link_libraries(kde-open ${KDE4_KIO_LIBS}) +target_link_libraries(kde-open KDE4::kio) install( TARGETS kde-open DESTINATION ${KDE4_BIN_INSTALL_DIR} @@ -25,7 +25,7 @@ install( set(kde-cp_SRCS kioclient.cpp ) add_executable(kde-cp ${kde-cp_SRCS}) target_compile_definitions(kde-cp PRIVATE -DKIOCLIENT_AS_KDECP) -target_link_libraries(kde-cp ${KDE4_KIO_LIBS}) +target_link_libraries(kde-cp KDE4::kio) install( TARGETS kde-cp DESTINATION ${KDE4_BIN_INSTALL_DIR} @@ -36,7 +36,7 @@ install( set(kde-mv_SRCS kioclient.cpp ) add_executable(kde-mv ${kde-mv_SRCS}) target_compile_definitions(kde-mv PRIVATE -DKIOCLIENT_AS_KDEMV) -target_link_libraries(kde-mv ${KDE4_KIO_LIBS}) +target_link_libraries(kde-mv KDE4::kio) install( TARGETS kde-mv DESTINATION ${KDE4_BIN_INSTALL_DIR} diff --git a/kioexec/CMakeLists.txt b/kioexec/CMakeLists.txt index 2deaac69..cd901618 100644 --- a/kioexec/CMakeLists.txt +++ b/kioexec/CMakeLists.txt @@ -2,7 +2,7 @@ set(kioexec_SRCS main.cpp ) add_executable(kioexec ${kioexec_SRCS}) -target_link_libraries(kioexec ${KDE4_KIO_LIBS}) +target_link_libraries(kioexec KDE4::kio) install( TARGETS kioexec diff --git a/kioslave/camera/CMakeLists.txt b/kioslave/camera/CMakeLists.txt index fee798d8..5372a970 100644 --- a/kioslave/camera/CMakeLists.txt +++ b/kioslave/camera/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( add_executable(kio_camera kio_camera.cpp) target_link_libraries(kio_camera - ${KDE4_KIO_LIBS} + KDE4::kio ${GPHOTO2_LIBRARIES} ) diff --git a/kioslave/desktop/CMakeLists.txt b/kioslave/desktop/CMakeLists.txt index 24f57eae..29ee4ae5 100644 --- a/kioslave/desktop/CMakeLists.txt +++ b/kioslave/desktop/CMakeLists.txt @@ -8,7 +8,7 @@ set(kio_desktop_PART_SRCS kio_desktop.cpp) add_executable(kio_desktop ${kio_desktop_PART_SRCS}) -target_link_libraries(kio_desktop ${KDE4_KIO_LIBS}) +target_link_libraries(kio_desktop KDE4::kio) install(TARGETS kio_desktop DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) @@ -18,7 +18,7 @@ set(kded_desktopnotifier_PART_SRCS desktopnotifier.cpp ) kde4_add_plugin(kded_desktopnotifier ${kded_desktopnotifier_PART_SRCS}) -target_link_libraries(kded_desktopnotifier ${KDE4_KIO_LIBS}) +target_link_libraries(kded_desktopnotifier KDE4::kio) install(TARGETS kded_desktopnotifier DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/desktop/tests/CMakeLists.txt b/kioslave/desktop/tests/CMakeLists.txt index 0a59a291..acd879a5 100644 --- a/kioslave/desktop/tests/CMakeLists.txt +++ b/kioslave/desktop/tests/CMakeLists.txt @@ -4,5 +4,5 @@ set(testdesktop_SRCS kio_desktop_test.cpp) kde4_add_test(testdesktop ${testdesktop_SRCS}) -target_link_libraries(testdesktop ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(testdesktop KDE4::kio KDE4::solid ${QT_QTTEST_LIBRARY}) diff --git a/kioslave/floppy/CMakeLists.txt b/kioslave/floppy/CMakeLists.txt index 4f20dd44..8ed14817 100644 --- a/kioslave/floppy/CMakeLists.txt +++ b/kioslave/floppy/CMakeLists.txt @@ -5,7 +5,7 @@ set(kio_floppy_PART_SRCS kio_floppy.cpp program.cpp ) add_executable(kio_floppy ${kio_floppy_PART_SRCS}) -target_link_libraries(kio_floppy ${KDE4_KIO_LIBS} ) +target_link_libraries(kio_floppy KDE4::kio ) install(TARGETS kio_floppy DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) diff --git a/kioslave/mtp/CMakeLists.txt b/kioslave/mtp/CMakeLists.txt index f7b39a5e..93c214fa 100644 --- a/kioslave/mtp/CMakeLists.txt +++ b/kioslave/mtp/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ) add_executable( kio_mtp ${kio_mtp_PART_SRCS} ) -target_link_libraries( kio_mtp ${KDE4_KIO_LIBS} ${MTP_LIBRARIES} ${KDE4_SOLID_LIBS}) +target_link_libraries( kio_mtp KDE4::kio ${MTP_LIBRARIES} KDE4::solid) install( TARGETS kio_mtp DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/kioslave/network/ioslave/CMakeLists.txt b/kioslave/network/ioslave/CMakeLists.txt index 913f6df9..76b9430d 100644 --- a/kioslave/network/ioslave/CMakeLists.txt +++ b/kioslave/network/ioslave/CMakeLists.txt @@ -8,8 +8,8 @@ set(kio_network_SRCS add_executable(kio_network ${kio_network_SRCS}) target_link_libraries(kio_network - ${KDE4_KIO_LIBS} - ${KDE4_KDNSSD_LIBS} + KDE4::kio + KDE4::kdnssd ) install( diff --git a/kioslave/remote/CMakeLists.txt b/kioslave/remote/CMakeLists.txt index 7e7bbae3..09d40875 100644 --- a/kioslave/remote/CMakeLists.txt +++ b/kioslave/remote/CMakeLists.txt @@ -8,7 +8,7 @@ set(kio_remote_PART_SRCS ${libkioremote_SRCS}) add_executable(kio_remote ${kio_remote_PART_SRCS}) -target_link_libraries(kio_remote ${KDE4_KIO_LIBS}) +target_link_libraries(kio_remote KDE4::kio) install(TARGETS kio_remote DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/kioslave/remote/kdedmodule/CMakeLists.txt b/kioslave/remote/kdedmodule/CMakeLists.txt index 13a0b09c..b8a3d730 100644 --- a/kioslave/remote/kdedmodule/CMakeLists.txt +++ b/kioslave/remote/kdedmodule/CMakeLists.txt @@ -9,7 +9,7 @@ set(kded_remotedirnotify_PART_SRCS remotedirnotify.cpp remotedirnotifymodule.cpp kde4_add_plugin(kded_remotedirnotify ${kded_remotedirnotify_PART_SRCS}) -target_link_libraries(kded_remotedirnotify ${KDE4_KIO_LIBS}) +target_link_libraries(kded_remotedirnotify KDE4::kio) install(TARGETS kded_remotedirnotify DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/sftp/CMakeLists.txt b/kioslave/sftp/CMakeLists.txt index 65b21c99..07f7d3a3 100644 --- a/kioslave/sftp/CMakeLists.txt +++ b/kioslave/sftp/CMakeLists.txt @@ -7,7 +7,7 @@ set(kio_sftp_PART_SRCS include_directories(${LIBSSH_INCLUDE_DIR}) add_executable(kio_sftp ${kio_sftp_PART_SRCS}) -target_link_libraries(kio_sftp ${KDE4_KIO_LIBS} ${LIBSSH_LIBRARIES}) +target_link_libraries(kio_sftp KDE4::kio ${LIBSSH_LIBRARIES}) install(TARGETS kio_sftp DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt index ad17a5a4..8614702d 100644 --- a/kioslave/thumbnail/CMakeLists.txt +++ b/kioslave/thumbnail/CMakeLists.txt @@ -4,7 +4,7 @@ set(kio_thumbnail_PART_SRCS thumbnail.cpp) add_executable(kio_thumbnail ${kio_thumbnail_PART_SRCS}) -target_link_libraries(kio_thumbnail ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS}) +target_link_libraries(kio_thumbnail KDE4::kio KDE4::kdeui) install(TARGETS kio_thumbnail DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) @@ -15,7 +15,7 @@ set(imagethumbnail_PART_SRCS imagecreator.cpp) kde4_add_kcfg_files(imagethumbnail_PART_SRCS imagecreatorsettings.kcfgc) kde4_add_plugin(imagethumbnail ${imagethumbnail_PART_SRCS}) -target_link_libraries(imagethumbnail ${KDE4_KIO_LIBS} ${KDE4_KEXIV2_LIBS}) +target_link_libraries(imagethumbnail KDE4::kio KDE4::kexiv2) install(TARGETS imagethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES imagecreatorsettings.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) @@ -31,7 +31,7 @@ set(textthumbnail_PART_SRCS textcreator.cpp) kde4_add_plugin(textthumbnail ${textthumbnail_PART_SRCS}) -target_link_libraries(textthumbnail ${KDE4_KIO_LIBS}) +target_link_libraries(textthumbnail KDE4::kio) install(TARGETS textthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) @@ -44,7 +44,7 @@ if(DJVULIBRE_FOUND) kde4_add_plugin(djvuthumbnail ${djvuthumbnail_PART_SRCS}) - target_link_libraries(djvuthumbnail ${KDE4_KIO_LIBS} ${DJVULIBRE_LIBRARY}) + target_link_libraries(djvuthumbnail KDE4::kio ${DJVULIBRE_LIBRARY}) install(TARGETS djvuthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES djvuthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) @@ -57,7 +57,7 @@ if(X11_Xcursor_FOUND) kde4_add_plugin(cursorthumbnail ${cursorthumbnail_PART_SRCS}) - target_link_libraries(cursorthumbnail ${X11_Xcursor_LIB} ${KDE4_KIO_LIBS}) + target_link_libraries(cursorthumbnail ${X11_Xcursor_LIB} KDE4::kio) install(TARGETS cursorthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES cursorthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) @@ -68,14 +68,14 @@ endif() set(windowsexethumbnail_SRCS windowsexecreator.cpp) kde4_add_plugin(windowsexethumbnail ${windowsexethumbnail_SRCS}) -target_link_libraries( windowsexethumbnail ${KDE4_KIO_LIBS} ) +target_link_libraries( windowsexethumbnail KDE4::kio ) install(TARGETS windowsexethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### set(comicbookthumbnail_SRCS comiccreator.cpp) kde4_add_plugin(comicbookthumbnail ${comicbookthumbnail_SRCS}) -target_link_libraries(comicbookthumbnail ${KDE4_KIO_LIBS} ${KDE4_KARCHIVE_LIBS}) +target_link_libraries(comicbookthumbnail KDE4::kio KDE4::karchive) install(TARGETS comicbookthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -86,7 +86,7 @@ if(EPUB_FOUND) set(epubthumbnail_SRCS epubthumbnail.cpp) kde4_add_plugin(epubthumbnail ${epubthumbnail_SRCS}) - target_link_libraries(epubthumbnail ${KDE4_KIO_LIBS} ${EPUB_LIBRARIES}) + target_link_libraries(epubthumbnail KDE4::kio ${EPUB_LIBRARIES}) install(TARGETS epubthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES epubthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kioslave/trash/CMakeLists.txt b/kioslave/trash/CMakeLists.txt index 7775ff01..c7de9670 100644 --- a/kioslave/trash/CMakeLists.txt +++ b/kioslave/trash/CMakeLists.txt @@ -17,8 +17,8 @@ set(kio_trash_PART_SRCS kio_trash.cpp ${trashcommon_PART_SRCS}) add_executable(kio_trash ${kio_trash_PART_SRCS}) target_link_libraries(kio_trash - ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kio + KDE4::solid ) install( @@ -32,7 +32,7 @@ set(ktrash_SRCS ktrash.cpp) add_executable(ktrash ${ktrash_SRCS}) -target_link_libraries(ktrash ${KDE4_KIO_LIBS}) +target_link_libraries(ktrash KDE4::kio) install( TARGETS ktrash @@ -44,9 +44,9 @@ install( set(kcm_trash_PART_SRCS kcmtrash.cpp ${trashcommon_PART_SRCS}) kde4_add_plugin(kcm_trash ${kcm_trash_PART_SRCS}) target_link_libraries(kcm_trash - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kdeui + KDE4::kio + KDE4::solid ) install( diff --git a/kioslave/trash/tests/CMakeLists.txt b/kioslave/trash/tests/CMakeLists.txt index 6e6579ed..50df1e87 100644 --- a/kioslave/trash/tests/CMakeLists.txt +++ b/kioslave/trash/tests/CMakeLists.txt @@ -11,4 +11,4 @@ set(testtrash_SRCS kde4_add_test(testtrash ${testtrash_SRCS}) -target_link_libraries(testtrash ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(testtrash KDE4::kio KDE4::solid ${QT_QTTEST_LIBRARY}) diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index 04ce5580..b56574a0 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -24,8 +24,8 @@ set(klipper_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp) add_executable(klipper ${klipper_SRCS}) target_link_libraries(klipper - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::kdeui + KDE4::kfile ${QT_QTNETWORK_LIBRARY} ${X11_LIBRARIES} ) diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index cfb355b8..bc74ae51 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -3,8 +3,8 @@ project(KMail) add_executable(kmail main.cpp) target_link_libraries(kmail - ${KDE4_KDECORE_LIBS} - ${KDE4_KEMAIL_LIBS} + KDE4::kdecore + KDE4::kemail ) install( diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt index 2e75f4a3..41c92279 100644 --- a/kmenuedit/CMakeLists.txt +++ b/kmenuedit/CMakeLists.txt @@ -29,7 +29,7 @@ set(kmenuedit_SRCS main.cpp ${kmenueditcommon_STAT_SRCS}) add_executable(kmenuedit ${kmenuedit_SRCS}) target_link_libraries(kmenuedit - ${KDE4_KIO_LIBS} + KDE4::kio ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ) diff --git a/kmimetypefinder/CMakeLists.txt b/kmimetypefinder/CMakeLists.txt index 58e3985c..abc4a758 100644 --- a/kmimetypefinder/CMakeLists.txt +++ b/kmimetypefinder/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(kmimetypefinder kmimetypefinder.cpp) -target_link_libraries(kmimetypefinder ${KDE4_KDECORE_LIBS}) +target_link_libraries(kmimetypefinder KDE4::kdecore) install( TARGETS kmimetypefinder diff --git a/knetattach/CMakeLists.txt b/knetattach/CMakeLists.txt index ef9ecf7b..1e89ea87 100644 --- a/knetattach/CMakeLists.txt +++ b/knetattach/CMakeLists.txt @@ -2,7 +2,7 @@ set(knetattach_SRCS main.cpp knetattach.cpp knetattach.ui ) add_executable(knetattach ${knetattach_SRCS}) -target_link_libraries(knetattach ${KDE4_KIO_LIBS}) +target_link_libraries(knetattach KDE4::kio) install( TARGETS knetattach diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt index bfed5742..11b2a5c6 100644 --- a/knotify/CMakeLists.txt +++ b/knotify/CMakeLists.txt @@ -21,9 +21,9 @@ set(knotify_SRCS add_executable(knotify4 ${knotify_SRCS}) target_link_libraries(knotify4 - ${KDE4_KDEUI_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KMEDIAPLAYER_LIBS} + KDE4::kdeui + KDE4::solid + KDE4::kmediaplayer ) install( diff --git a/konsole/src/CMakeLists.txt b/konsole/src/CMakeLists.txt index b6923687..95cb579e 100644 --- a/konsole/src/CMakeLists.txt +++ b/konsole/src/CMakeLists.txt @@ -20,7 +20,7 @@ option(KONSOLE_BUILD_FONTEMBEDDER "Konsole: build fontembedder executable" OFF) if(KONSOLE_BUILD_FONTEMBEDDER) ### Font Embedder add_executable(fontembedder fontembedder.cpp) - target_link_libraries(fontembedder ${KDE4_KIO_LIBS}) + target_link_libraries(fontembedder KDE4::kio) ### Line graphics font ### The below cmake doesn't work; it might be possible to automate it @@ -123,9 +123,9 @@ set_source_files_properties( add_library(konsoleprivate SHARED ${konsoleprivate_SRCS}) target_link_libraries(konsoleprivate - ${KDE4_KPTY_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KNOTIFYCONFIG_LIBS} + KDE4::kpty + KDE4::kio + KDE4::knotifyconfig ${QT_QTXML_LIBRARY} konq ) @@ -174,7 +174,7 @@ install( kde4_add_plugin(konsolepart Part.cpp) target_link_libraries(konsolepart - ${KDE4_KPARTS_LIBS} + KDE4::kparts konsoleprivate ) install( diff --git a/konsole/src/tests/CMakeLists.txt b/konsole/src/tests/CMakeLists.txt index 021c6b2a..71ae5d4a 100644 --- a/konsole/src/tests/CMakeLists.txt +++ b/konsole/src/tests/CMakeLists.txt @@ -6,8 +6,8 @@ include_directories( set(KONSOLE_TEST_LIBS ${QT_QTTEST_LIBRARY} - ${KDE4_KPARTS_LIBS} - ${KDE4_KPTY_LIBS} + KDE4::kparts + KDE4::kpty konsoleprivate ) diff --git a/kquitapp/CMakeLists.txt b/kquitapp/CMakeLists.txt index 635550c6..e805f530 100644 --- a/kquitapp/CMakeLists.txt +++ b/kquitapp/CMakeLists.txt @@ -1,7 +1,7 @@ set(kquitapp_SRCS kquitapp.cpp) add_executable(kquitapp ${kquitapp_SRCS}) -target_link_libraries(kquitapp ${KDE4_KDECORE_LIBS}) +target_link_libraries(kquitapp KDE4::kdecore) install( TARGETS kquitapp diff --git a/kreadconfig/CMakeLists.txt b/kreadconfig/CMakeLists.txt index 8ef49552..62407baa 100644 --- a/kreadconfig/CMakeLists.txt +++ b/kreadconfig/CMakeLists.txt @@ -4,7 +4,7 @@ set(kreadconfig_SRCS kreadconfig.cpp ) add_executable(kreadconfig ${kreadconfig_SRCS}) -target_link_libraries(kreadconfig ${KDE4_KDECORE_LIBS}) +target_link_libraries(kreadconfig KDE4::kdecore) install( TARGETS kreadconfig @@ -16,7 +16,7 @@ install( set(kwriteconfig_SRCS kwriteconfig.cpp ) add_executable(kwriteconfig ${kwriteconfig_SRCS}) -target_link_libraries(kwriteconfig ${KDE4_KDECORE_LIBS}) +target_link_libraries(kwriteconfig KDE4::kdecore) install( TARGETS kwriteconfig diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt index e8297898..8a6f68fa 100644 --- a/krunner/CMakeLists.txt +++ b/krunner/CMakeLists.txt @@ -55,10 +55,10 @@ set(krunner_SRCS add_executable(krunner ${krunner_SRCS}) target_link_libraries(krunner - ${KDE4_PLASMA_LIBS} + KDE4::plasma ${KDE4_SOLID_LIBRARIES} - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kdeui + KDE4::kcmutils ${X11_X11_LIB} kworkspace plasmagenericshell diff --git a/kscreensaver/CMakeLists.txt b/kscreensaver/CMakeLists.txt index 7dd74176..ec1a0987 100644 --- a/kscreensaver/CMakeLists.txt +++ b/kscreensaver/CMakeLists.txt @@ -22,8 +22,8 @@ qt4_generate_dbus_interface(kded_kscreensaver.h org.kde.kscreensaver.xml) kde4_add_plugin(kded_kscreensaver ${kded_kscreensaver_SRCS}) target_link_libraries(kded_kscreensaver PRIVATE - ${KDE4_KDECORE_LIBS} - ${KDE4_KIDLETIME_LIBS} + KDE4::kdecore + KDE4::kidletime ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ) diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 4c9377bd..66a8227e 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -49,11 +49,11 @@ qt4_add_dbus_adaptor(ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMS add_executable(ksmserver ${ksmserver_SRCS}) target_link_libraries(ksmserver - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KDECLARATIVE_LIBS} + KDE4::plasma + KDE4::kdeui + KDE4::kio + KDE4::solid + KDE4::kdeclarative ${QT_QTDECLARATIVE_LIBRARY} ${X11_LIBRARIES} kworkspace diff --git a/ksmserver/kcm/CMakeLists.txt b/ksmserver/kcm/CMakeLists.txt index 1e86175f..b86fbf49 100644 --- a/ksmserver/kcm/CMakeLists.txt +++ b/ksmserver/kcm/CMakeLists.txt @@ -8,7 +8,7 @@ set(kcm_smserver_PART_SRCS kde4_add_plugin(kcm_smserver ${kcm_smserver_PART_SRCS}) -target_link_libraries(kcm_smserver ${KDE4_KDEUI_LIBS}) +target_link_libraries(kcm_smserver KDE4::kdeui) install(TARGETS kcm_smserver DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/ksmserver/tests/CMakeLists.txt b/ksmserver/tests/CMakeLists.txt index 9a580a63..bcd3b467 100644 --- a/ksmserver/tests/CMakeLists.txt +++ b/ksmserver/tests/CMakeLists.txt @@ -9,10 +9,10 @@ kde4_add_manual_test(testsh ${testsh_SRCS}) target_link_libraries(testsh kworkspace - ${KDE4_KDEUI_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KDECLARATIVE_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::solid + KDE4::kdeclarative + KDE4::plasma ${X11_X11_LIB} ${QT_QTDECLARATIVE_LIBRARY} ) diff --git a/kstart/CMakeLists.txt b/kstart/CMakeLists.txt index e27a7a1e..4f6363d8 100644 --- a/kstart/CMakeLists.txt +++ b/kstart/CMakeLists.txt @@ -4,7 +4,7 @@ set(kstart_SRCS kstart.cpp) add_executable(kstart ${kstart_SRCS}) target_link_libraries(kstart - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_X11_LIB} ) diff --git a/kstyles/oxygen/CMakeLists.txt b/kstyles/oxygen/CMakeLists.txt index 0aaf94b7..f1660194 100644 --- a/kstyles/oxygen/CMakeLists.txt +++ b/kstyles/oxygen/CMakeLists.txt @@ -28,7 +28,7 @@ kde4_add_kcfg_files(oxygen_PART_SRCS oxygenstyleconfigdata.kcfgc) kde4_add_plugin(oxygen ${oxygen_PART_SRCS}) -target_link_libraries(oxygen ${KDE4_KDEUI_LIBS} oxygenstyle) +target_link_libraries(oxygen KDE4::kdeui oxygenstyle) if ( X11_FOUND ) target_link_libraries(oxygen ${X11_LIBRARIES}) diff --git a/kstyles/oxygen/config/CMakeLists.txt b/kstyles/oxygen/config/CMakeLists.txt index 9b02ca59..f735e4c7 100644 --- a/kstyles/oxygen/config/CMakeLists.txt +++ b/kstyles/oxygen/config/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_kcfg_files(kstyle_oxygen_config_PART_SRCS ../oxygenstyleconfigdata.kcfg kde4_add_plugin(kstyle_oxygen_config ${kstyle_oxygen_config_PART_SRCS}) target_link_libraries(kstyle_oxygen_config - ${KDE4_KDEUI_LIBS} + KDE4::kdeui oxygenstyleconfig ) @@ -30,7 +30,7 @@ set(oxygen_settings_SOURCES add_executable(oxygen-settings ${oxygen_settings_SOURCES}) target_link_libraries(oxygen-settings - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) diff --git a/kstyles/oxygen/demo/CMakeLists.txt b/kstyles/oxygen/demo/CMakeLists.txt index 19afd850..82698ee8 100644 --- a/kstyles/oxygen/demo/CMakeLists.txt +++ b/kstyles/oxygen/demo/CMakeLists.txt @@ -24,7 +24,7 @@ set(oxygen_demo_SOURCES add_executable(oxygen-demo ${oxygen_demo_SOURCES}) target_link_libraries(oxygen-demo - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt index 99bcdb95..c56dff5d 100644 --- a/ksysguard/gui/CMakeLists.txt +++ b/ksysguard/gui/CMakeLists.txt @@ -54,7 +54,7 @@ set(ksysguard_SRCS ${libsensordisplays_SRCS} add_executable(ksysguard ${ksysguard_SRCS}) target_link_libraries(ksysguard - ${KDE4_KIO_LIBS} + KDE4::kio processui ksignalplotter ksgrd ) diff --git a/ksysguard/gui/tests/CMakeLists.txt b/ksysguard/gui/tests/CMakeLists.txt index ad7ac04e..f14ec4e4 100644 --- a/ksysguard/gui/tests/CMakeLists.txt +++ b/ksysguard/gui/tests/CMakeLists.txt @@ -9,7 +9,7 @@ set( ksysguarddtest_SRCS kde4_add_test(ksysguard-ksysguarddtest ${ksysguarddtest_SRCS}) target_link_libraries(ksysguard-ksysguarddtest - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) diff --git a/ksystraycmd/CMakeLists.txt b/ksystraycmd/CMakeLists.txt index a87afe0a..2098200f 100644 --- a/ksystraycmd/CMakeLists.txt +++ b/ksystraycmd/CMakeLists.txt @@ -2,7 +2,7 @@ set(ksystraycmd_SRCS ksystraycmd.cpp main.cpp ) add_executable(ksystraycmd ${ksystraycmd_SRCS}) target_link_libraries(ksystraycmd - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_X11_LIB} ) diff --git a/ktouchpadenabler/CMakeLists.txt b/ktouchpadenabler/CMakeLists.txt index 317544db..6aca369c 100644 --- a/ktouchpadenabler/CMakeLists.txt +++ b/ktouchpadenabler/CMakeLists.txt @@ -9,8 +9,8 @@ kde4_add_kcfg_files(kded_ktouchpadenabler_SRCS settings.kcfgc ) kde4_add_plugin(kded_ktouchpadenabler ${kded_ktouchpadenabler_SRCS}) target_link_libraries(kded_ktouchpadenabler - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::kdecore + KDE4::kdeui ${X11_X11_LIB} ${X11_Xinput_LIB} ) diff --git a/ktraderclient/CMakeLists.txt b/ktraderclient/CMakeLists.txt index caca1591..71725c26 100644 --- a/ktraderclient/CMakeLists.txt +++ b/ktraderclient/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(ktraderclient ktraderclient.cpp) -target_link_libraries(ktraderclient ${KDE4_KDECORE_LIBS}) +target_link_libraries(ktraderclient KDE4::kdecore) install( TARGETS ktraderclient diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt index bab8c5be..ef2f2050 100644 --- a/kuiserver/CMakeLists.txt +++ b/kuiserver/CMakeLists.txt @@ -39,7 +39,7 @@ kde4_add_kcfg_files(kuiserver_SRCS kuiserversettings.kcfgc) add_executable(kuiserver ${kuiserver_SRCS}) -target_link_libraries(kuiserver ${KDE4_KIO_LIBS}) +target_link_libraries(kuiserver KDE4::kio) install( TARGETS kuiserver diff --git a/kuiserver/tests/CMakeLists.txt b/kuiserver/tests/CMakeLists.txt index b7e0b4ea..68ed716b 100644 --- a/kuiserver/tests/CMakeLists.txt +++ b/kuiserver/tests/CMakeLists.txt @@ -4,5 +4,5 @@ set(kuiservertest_SRCS kuiservertest.cpp) kde4_add_manual_test(kuiservertest ${kuiservertest_SRCS}) -target_link_libraries(kuiservertest ${KDE4_KIO_LIBS}) +target_link_libraries(kuiservertest KDE4::kio) diff --git a/kurifilter-plugins/fixhost/CMakeLists.txt b/kurifilter-plugins/fixhost/CMakeLists.txt index 0786f64a..01af8d84 100644 --- a/kurifilter-plugins/fixhost/CMakeLists.txt +++ b/kurifilter-plugins/fixhost/CMakeLists.txt @@ -2,7 +2,7 @@ set(fixhosturifilter_PART_SRCS fixhosturifilter.cpp ) kde4_add_plugin(fixhosturifilter ${fixhosturifilter_PART_SRCS}) -target_link_libraries(fixhosturifilter ${KDE4_KIO_LIBS}) +target_link_libraries(fixhosturifilter KDE4::kio) install(TARGETS fixhosturifilter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kurifilter-plugins/ikws/CMakeLists.txt b/kurifilter-plugins/ikws/CMakeLists.txt index ef530ae1..13bceab4 100644 --- a/kurifilter-plugins/ikws/CMakeLists.txt +++ b/kurifilter-plugins/ikws/CMakeLists.txt @@ -14,7 +14,7 @@ set(kuriikwsfilter_PART_SRCS kde4_add_plugin(kuriikwsfilter ${kuriikwsfilter_PART_SRCS}) -target_link_libraries(kuriikwsfilter ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kuriikwsfilter KDE4::kdeui KDE4::kio) install(TARGETS kuriikwsfilter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) @@ -31,7 +31,7 @@ set(kurisearchfilter_PART_SRCS kde4_add_plugin(kurisearchfilter ${kurisearchfilter_PART_SRCS}) -target_link_libraries(kurisearchfilter ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kurisearchfilter KDE4::kdeui KDE4::kio) install(TARGETS kurisearchfilter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kurifilter-plugins/localdomain/CMakeLists.txt b/kurifilter-plugins/localdomain/CMakeLists.txt index d567ea8b..3cef29c0 100644 --- a/kurifilter-plugins/localdomain/CMakeLists.txt +++ b/kurifilter-plugins/localdomain/CMakeLists.txt @@ -2,7 +2,7 @@ set(localdomainurifilter_PART_SRCS localdomainurifilter.cpp ) kde4_add_plugin(localdomainurifilter ${localdomainurifilter_PART_SRCS}) -target_link_libraries(localdomainurifilter ${KDE4_KIO_LIBS}) +target_link_libraries(localdomainurifilter KDE4::kio) install(TARGETS localdomainurifilter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kurifilter-plugins/shorturi/CMakeLists.txt b/kurifilter-plugins/shorturi/CMakeLists.txt index dd7c9008..d231c1e9 100644 --- a/kurifilter-plugins/shorturi/CMakeLists.txt +++ b/kurifilter-plugins/shorturi/CMakeLists.txt @@ -9,7 +9,7 @@ set(kshorturifilter_PART_SRCS kshorturifilter.cpp ) kde4_add_plugin(kshorturifilter ${kshorturifilter_PART_SRCS}) -target_link_libraries(kshorturifilter ${KDE4_KIO_LIBS}) +target_link_libraries(kshorturifilter KDE4::kio) install(TARGETS kshorturifilter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kurifilter-plugins/tests/CMakeLists.txt b/kurifilter-plugins/tests/CMakeLists.txt index 9a933ae7..97fca477 100644 --- a/kurifilter-plugins/tests/CMakeLists.txt +++ b/kurifilter-plugins/tests/CMakeLists.txt @@ -2,5 +2,5 @@ set(kurifiltertest_SRCS kurifiltertest.cpp) kde4_add_test(kurifiltertest ${kurifiltertest_SRCS}) -target_link_libraries(kurifiltertest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kurifiltertest KDE4::kio ${QT_QTTEST_LIBRARY}) diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt index 358324fb..55e81a64 100644 --- a/kwin/CMakeLists.txt +++ b/kwin/CMakeLists.txt @@ -73,7 +73,7 @@ set_source_files_properties( ) kde4_add_plugin(kcm_kwin4_effect_builtins ${kwin4_effect_builtins_config_sources}) -target_link_libraries(kcm_kwin4_effect_builtins kwineffects ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS}) +target_link_libraries(kcm_kwin4_effect_builtins kwineffects KDE4::kio KDE4::kdeui) install(TARGETS kcm_kwin4_effect_builtins DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -166,8 +166,8 @@ endif() add_executable(kwin ${kwin_SRCS} ${kwin4_effect_builtins_sources}) target_link_libraries(kwin - ${KDE4_KDEUI_LIBS} - ${KDE4_KDECLARATIVE_LIBS} + KDE4::kdeui + KDE4::kdeclarative ${X11_X11_LIB} ${X11_Xext_LIB} ${X11_ICE_LIB} diff --git a/kwin/clients/aurorae/src/CMakeLists.txt b/kwin/clients/aurorae/src/CMakeLists.txt index ad4848c2..9b1e42b3 100644 --- a/kwin/clients/aurorae/src/CMakeLists.txt +++ b/kwin/clients/aurorae/src/CMakeLists.txt @@ -13,7 +13,7 @@ set(kwin3_aurorae_PART_SRCS kde4_add_plugin(kwin3_aurorae ${kwin3_aurorae_PART_SRCS}) -target_link_libraries(kwin3_aurorae ${KDE4_KDEUI_LIBS} ${QT_QTDECLARATIVE_LIBRARY} kdecorations) +target_link_libraries(kwin3_aurorae KDE4::kdeui ${QT_QTDECLARATIVE_LIBRARY} kdecorations) install(TARGETS kwin3_aurorae DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) @@ -24,7 +24,7 @@ set(decoration_plugin_SRCS ) add_library(decorationplugin SHARED ${decoration_plugin_SRCS}) -target_link_libraries(decorationplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBS} kdecorations) +target_link_libraries(decorationplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} KDE4::kdeui kdecorations) install(TARGETS decorationplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/kwin/decoration) ########### install files ############### diff --git a/kwin/clients/aurorae/themes/plastik/code/CMakeLists.txt b/kwin/clients/aurorae/themes/plastik/code/CMakeLists.txt index 2b694d41..e43c1e15 100644 --- a/kwin/clients/aurorae/themes/plastik/code/CMakeLists.txt +++ b/kwin/clients/aurorae/themes/plastik/code/CMakeLists.txt @@ -4,6 +4,6 @@ set(plastik_plugin_SRCS ) add_library(plastikplugin SHARED ${plastik_plugin_SRCS}) -target_link_libraries(plastikplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBS} kdecorations) +target_link_libraries(plastikplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} KDE4::kdeui kdecorations) install(TARGETS plastikplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/kwin/decorations/plastik) install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/kwin/decorations/plastik) diff --git a/kwin/clients/oxygen/CMakeLists.txt b/kwin/clients/oxygen/CMakeLists.txt index e23c6043..fefebdc8 100644 --- a/kwin/clients/oxygen/CMakeLists.txt +++ b/kwin/clients/oxygen/CMakeLists.txt @@ -21,7 +21,7 @@ kde4_add_kcfg_files(kwin_oxygen_SRCS oxygenconfiguration.kcfgc) kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS}) target_link_libraries(kwin3_oxygen - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_X11_LIB} kdecorations oxygenstyle diff --git a/kwin/clients/oxygen/config/CMakeLists.txt b/kwin/clients/oxygen/config/CMakeLists.txt index d588621b..83ef40d2 100644 --- a/kwin/clients/oxygen/config/CMakeLists.txt +++ b/kwin/clients/oxygen/config/CMakeLists.txt @@ -17,7 +17,7 @@ kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc) kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS}) target_link_libraries(kwin_oxygen_config - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_X11_LIB} kdecorations oxygenstyle diff --git a/kwin/clients/oxygen/demo/CMakeLists.txt b/kwin/clients/oxygen/demo/CMakeLists.txt index 357ff73f..b192f955 100644 --- a/kwin/clients/oxygen/demo/CMakeLists.txt +++ b/kwin/clients/oxygen/demo/CMakeLists.txt @@ -13,9 +13,9 @@ set(oxygen_shadow_demo_SOURCES add_executable(oxygen-shadow-demo ${oxygen_shadow_demo_SOURCES}) target_link_libraries(oxygen-shadow-demo - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${X11_X11_LIB} - ${KDE4_KIO_LIBS} + KDE4::kio oxygenstyle ) diff --git a/kwin/kcmkwin/kwincompositing/CMakeLists.txt b/kwin/kcmkwin/kwincompositing/CMakeLists.txt index 813a4c45..aa27a32f 100644 --- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt @@ -12,7 +12,7 @@ set(kwin_xml ${CMAKE_SOURCE_DIR}/kwin/org.kde.KWin.xml) set_source_files_properties(${kwin_xml} PROPERTIES INCLUDE "interface_util.h") QT4_ADD_DBUS_INTERFACE(kcm_kwincompositing_PART_SRCS ${kwin_xml} kwin_interface) kde4_add_plugin(kcm_kwincompositing ${kcm_kwincompositing_PART_SRCS}) -target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kcm_kwincompositing KDE4::kcmutils KDE4::kdeui ${X11_LIBRARIES}) install(TARGETS kcm_kwincompositing DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/kwindecoration/CMakeLists.txt b/kwin/kcmkwin/kwindecoration/CMakeLists.txt index ee32b4ed..bc142db5 100644 --- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt @@ -22,7 +22,7 @@ set(kcm_kwindecoration_PART_SRCS kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS}) target_link_libraries(kcm_kwindecoration - ${KDE4_PLASMA_LIBS} + KDE4::plasma ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${X11_LIBRARIES} diff --git a/kwin/kcmkwin/kwindesktop/CMakeLists.txt b/kwin/kcmkwin/kwindesktop/CMakeLists.txt index 49f13642..14dfc9eb 100644 --- a/kwin/kcmkwin/kwindesktop/CMakeLists.txt +++ b/kwin/kcmkwin/kwindesktop/CMakeLists.txt @@ -5,7 +5,7 @@ set(kcm_kwindesktop_PART_SRCS main.cpp desktopnameswidget.cpp main.ui) kde4_add_plugin(kcm_kwindesktop ${kcm_kwindesktop_PART_SRCS}) -target_link_libraries(kcm_kwindesktop ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kcm_kwindesktop KDE4::kdeui KDE4::kcmutils ${X11_LIBRARIES}) install(TARGETS kcm_kwindesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/kwinoptions/CMakeLists.txt b/kwin/kcmkwin/kwinoptions/CMakeLists.txt index c4a1bee0..76fe9971 100644 --- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt @@ -12,7 +12,7 @@ set(kcm_kwinoptions_PART_SRCS ) kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS}) -target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS}) +target_link_libraries(kcm_kwinoptions KDE4::kdeui) install( TARGETS kcm_kwinoptions diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt index f7e53091..642aa9ed 100644 --- a/kwin/kcmkwin/kwinrules/CMakeLists.txt +++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt @@ -23,7 +23,7 @@ set(kwin_kcm_rules_XCB_LIBS ${X11_XCB_LIBRARIES} ) -target_link_libraries(kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) +target_link_libraries(kwin_rules_dialog KDE4::kdeui KDE4::kio ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) install(TARGETS kwin_rules_dialog DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) @@ -34,7 +34,7 @@ set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS}) kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS}) -target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) +target_link_libraries(kcm_kwinrules KDE4::kdeui KDE4::kio ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) install(TARGETS kcm_kwinrules DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt index 31ad12aa..7af993ad 100644 --- a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt @@ -5,7 +5,7 @@ set(kcm_kwinscreenedges_SRCS monitor.cpp ) kde4_add_plugin(kcm_kwinscreenedges ${kcm_kwinscreenedges_SRCS}) -target_link_libraries(kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PLASMA_LIBS}) +target_link_libraries(kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace KDE4::plasma) install(TARGETS kcm_kwinscreenedges DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES kwinscreenedges.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kwin/kcmkwin/kwintabbox/CMakeLists.txt b/kwin/kcmkwin/kwintabbox/CMakeLists.txt index 97b7dfe9..fd7f7e3f 100644 --- a/kwin/kcmkwin/kwintabbox/CMakeLists.txt +++ b/kwin/kcmkwin/kwintabbox/CMakeLists.txt @@ -19,12 +19,12 @@ set(kcm_kwintabbox_PART_SRCS kde4_add_plugin(kcm_kwintabbox ${kcm_kwintabbox_PART_SRCS}) target_link_libraries(kcm_kwintabbox - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::kcmutils + KDE4::plasma ${X11_LIBRARIES} ${QT_QTDECLARATIVE_LIBRARY} - ${KDE4_KDECLARATIVE_LIBS} + KDE4::kdeclarative ) install( diff --git a/kwin/killer/CMakeLists.txt b/kwin/killer/CMakeLists.txt index 78ff4f18..f0e4ea60 100644 --- a/kwin/killer/CMakeLists.txt +++ b/kwin/killer/CMakeLists.txt @@ -5,6 +5,6 @@ set(kwin_killer_helper_SRCS killer.cpp ) add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS}) -target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS} ${X11_X11_LIB}) +target_link_libraries(kwin_killer_helper KDE4::kdeui ${X11_X11_LIB}) install(TARGETS kwin_killer_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) diff --git a/kwin/libkdecorations/CMakeLists.txt b/kwin/libkdecorations/CMakeLists.txt index 44b2c521..652b45cd 100644 --- a/kwin/libkdecorations/CMakeLists.txt +++ b/kwin/libkdecorations/CMakeLists.txt @@ -9,8 +9,8 @@ set(kdecorations_LIB_SRCS add_library(kdecorations SHARED ${kdecorations_LIB_SRCS}) -target_link_libraries(kdecorations PRIVATE ${KDE4_KDEUI_LIBS}) -target_link_libraries(kdecorations PUBLIC ${KDE4_KDEUI_LIBS}) +target_link_libraries(kdecorations PRIVATE KDE4::kdeui) +target_link_libraries(kdecorations PUBLIC KDE4::kdeui) set_target_properties(kdecorations PROPERTIES VERSION ${GENERIC_LIB_VERSION} diff --git a/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMakeLists.txt index c2777e19..e48dbc5e 100644 --- a/kwin/libkwineffects/CMakeLists.txt +++ b/kwin/libkwineffects/CMakeLists.txt @@ -14,7 +14,7 @@ set(kwineffects_QT_LIBS ) set(kwineffects_KDE_LIBS - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ) set(kwineffects_XLIB_LIBS diff --git a/kwin/tabbox/tests/CMakeLists.txt b/kwin/tabbox/tests/CMakeLists.txt index 88303bdd..15944b79 100644 --- a/kwin/tabbox/tests/CMakeLists.txt +++ b/kwin/tabbox/tests/CMakeLists.txt @@ -14,7 +14,7 @@ set( testTabBoxClientModel_SRCS kde4_add_test(kwin-testTabBoxClientModel ${testTabBoxClientModel_SRCS} ) -target_link_libraries(kwin-testTabBoxClientModel ${KDE4_KDEUI_LIBS} ${QT_QTDECLARATIVE_LIBRARY} ${X11_LIBRARIES} ${QT_QTTEST_LIBRARY} ) +target_link_libraries(kwin-testTabBoxClientModel KDE4::kdeui ${QT_QTDECLARATIVE_LIBRARY} ${X11_LIBRARIES} ${QT_QTTEST_LIBRARY} ) ######################################################## # Test TabBox::TabBoxHandler @@ -33,7 +33,7 @@ set( testTabBoxHandler_SRCS kde4_add_test(kwin-testTabBoxHandler ${testTabBoxHandler_SRCS}) target_link_libraries(kwin-testTabBoxHandler - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} diff --git a/kwin/tests/CMakeLists.txt b/kwin/tests/CMakeLists.txt index 2e3fd0e7..160797e3 100644 --- a/kwin/tests/CMakeLists.txt +++ b/kwin/tests/CMakeLists.txt @@ -24,7 +24,7 @@ set( testVirtualDesktops_SRCS kde4_add_test(kwin-testVirtualDesktops ${testVirtualDesktops_SRCS}) target_link_libraries(kwin-testVirtualDesktops - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ) @@ -49,7 +49,7 @@ kde4_add_test(kwin-testClientMachine ${testClientMachine_SRCS}) target_link_libraries(kwin-testClientMachine ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ${XCB_XCB_LIBRARIES} ${XCB_XFIXES_LIBRARIES} ${X11_XCB_LIBRARIES} diff --git a/libs/konq/CMakeLists.txt b/libs/konq/CMakeLists.txt index 41b006e8..50366d84 100644 --- a/libs/konq/CMakeLists.txt +++ b/libs/konq/CMakeLists.txt @@ -22,8 +22,8 @@ target_link_libraries(konq PRIVATE ${X11_X11_LIB} ) target_link_libraries(konq PUBLIC - ${KDE4_KPARTS_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::kparts + KDE4::kfile ) set_target_properties(konq PROPERTIES diff --git a/libs/konq/favicons/CMakeLists.txt b/libs/konq/favicons/CMakeLists.txt index 6428c086..53d5c009 100644 --- a/libs/konq/favicons/CMakeLists.txt +++ b/libs/konq/favicons/CMakeLists.txt @@ -10,7 +10,7 @@ qt4_add_dbus_adaptor(kded_favicons_SRCS kde4_add_plugin(kded_favicons ${kded_favicons_SRCS}) -target_link_libraries(kded_favicons ${KDE4_KIO_LIBS}) +target_link_libraries(kded_favicons KDE4::kio) install( diff --git a/libs/konq/tests/CMakeLists.txt b/libs/konq/tests/CMakeLists.txt index fb6fefed..177e9724 100644 --- a/libs/konq/tests/CMakeLists.txt +++ b/libs/konq/tests/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( kde4_add_test(libkonq-konqmimedatatest konqmimedatatest.cpp) target_link_libraries(libkonq-konqmimedatatest konq - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} @@ -19,7 +19,7 @@ target_link_libraries(libkonq-konqmimedatatest konq kde4_add_test(libkonq-konqpopupmenutest konqpopupmenutest.cpp) target_link_libraries(libkonq-konqpopupmenutest - ${KDE4_KFILE_LIBS} + KDE4::kfile ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} @@ -38,12 +38,12 @@ qt4_add_dbus_interface(favicontest_SRCS kde4_add_test(libkonq-favicontest ${favicontest_SRCS}) target_link_libraries(libkonq-favicontest - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdecore + KDE4::kio ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTTEST_LIBRARY} - ${KDE4_SOLID_LIBS} + KDE4::solid konq ) diff --git a/libs/ksysguard/ksgrd/CMakeLists.txt b/libs/ksysguard/ksgrd/CMakeLists.txt index 74515699..d623639a 100644 --- a/libs/ksysguard/ksgrd/CMakeLists.txt +++ b/libs/ksysguard/ksgrd/CMakeLists.txt @@ -10,7 +10,7 @@ set(ksgrd_LIB_SRCS add_library(ksgrd SHARED ${ksgrd_LIB_SRCS}) target_link_libraries(ksgrd - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) diff --git a/libs/ksysguard/lsofui/CMakeLists.txt b/libs/ksysguard/lsofui/CMakeLists.txt index 4f95d9ed..9e0a357a 100644 --- a/libs/ksysguard/lsofui/CMakeLists.txt +++ b/libs/ksysguard/lsofui/CMakeLists.txt @@ -7,7 +7,7 @@ set(lsofui_LIB_SRCS ) add_library(lsofui SHARED ${lsofui_LIB_SRCS}) -target_link_libraries(lsofui ${KDE4_KIO_LIBS}) +target_link_libraries(lsofui KDE4::kio) set_target_properties(lsofui PROPERTIES VERSION ${GENERIC_LIB_VERSION} @@ -32,7 +32,7 @@ kde4_add_widget(ksysguardlsofwidgets_SRCS ksysguardlsof.widgets) kde4_add_plugin(ksysguardlsofwidgets ${ksysguardlsofwidgets_SRCS}) target_link_libraries(ksysguardlsofwidgets - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ${QT_QTGUI_LIBRARY} lsofui ) diff --git a/libs/ksysguard/processcore/CMakeLists.txt b/libs/ksysguard/processcore/CMakeLists.txt index 60abfeae..a64856e9 100644 --- a/libs/ksysguard/processcore/CMakeLists.txt +++ b/libs/ksysguard/processcore/CMakeLists.txt @@ -12,7 +12,7 @@ set(ksysguard_LIB_SRCS add_library(processcore SHARED ${ksysguard_LIB_SRCS}) target_link_libraries(processcore PUBLIC - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ) if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") message(STATUS "Adding kvm library on NetBSD") @@ -51,7 +51,7 @@ set(ksysguardprocesslist_helper_srcs add_executable(ksysguardprocesslist_helper ${ksysguardprocesslist_helper_srcs}) target_link_libraries(ksysguardprocesslist_helper PUBLIC - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ) if(CMAKE_SYSTEM_NAME MATCHES "NetBSD" ) message(STATUS "Adding kvm library on NetBSD") diff --git a/libs/ksysguard/processui/CMakeLists.txt b/libs/ksysguard/processui/CMakeLists.txt index f801218b..a3f5faf0 100644 --- a/libs/ksysguard/processui/CMakeLists.txt +++ b/libs/ksysguard/processui/CMakeLists.txt @@ -18,7 +18,7 @@ if(X11_XRes_FOUND) endif() target_link_libraries(processui PRIVATE ${QT_QTSCRIPT_LIBRARY}) -target_link_libraries(processui PUBLIC ${KDE4_KDEUI_LIBS} processcore) +target_link_libraries(processui PUBLIC KDE4::kdeui processcore) set_target_properties(processui @@ -38,7 +38,7 @@ kde4_add_widget(ksysguardwidgets_SRCS ksysguard.widgets) kde4_add_plugin(ksysguardwidgets ${ksysguardwidgets_SRCS} ${ksysguardwidgets_PART_SRCS}) -target_link_libraries(ksysguardwidgets ${KDE4_KDEUI_LIBS} processui) +target_link_libraries(ksysguardwidgets KDE4::kdeui processui) install( TARGETS ksysguardwidgets diff --git a/libs/ksysguard/signalplotter/CMakeLists.txt b/libs/ksysguard/signalplotter/CMakeLists.txt index b48b56cd..3dec0aac 100644 --- a/libs/ksysguard/signalplotter/CMakeLists.txt +++ b/libs/ksysguard/signalplotter/CMakeLists.txt @@ -3,7 +3,7 @@ set(ksignalplotter_LIB_SRCS ) add_library(ksignalplotter SHARED ${ksignalplotter_LIB_SRCS}) -target_link_libraries(ksignalplotter PUBLIC ${KDE4_KDEUI_LIBS}) +target_link_libraries(ksignalplotter PUBLIC KDE4::kdeui) set_target_properties(ksignalplotter PROPERTIES VERSION ${GENERIC_LIB_VERSION} @@ -23,7 +23,7 @@ kde4_add_widget(ksignalplotterwidgets_SRCS ksignalplotter.widgets) kde4_add_plugin(ksignalplotterwidgets ${ksignalplotterwidgets_SRCS} ${ksignalplotterwidgets_PART_SRCS}) target_link_libraries(ksignalplotterwidgets - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ksignalplotter ) diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt index d1f00b54..9205d1aa 100644 --- a/libs/ksysguard/tests/CMakeLists.txt +++ b/libs/ksysguard/tests/CMakeLists.txt @@ -4,14 +4,14 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../processui/ ) # Process unit test kde4_add_test(ksysguard-processtest processtest.cpp) -target_link_libraries(ksysguard-processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(ksysguard-processtest processui KDE4::kdecore ${QT_QTTEST_LIBRARY}) # KSignalPlotter benchmark set(signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) kde4_add_test(ksysguard-signalplotterbenchmark ${signalplotterbenchmark_SRCS}) -target_link_libraries(ksysguard-signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY}) +target_link_libraries(ksysguard-signalplotterbenchmark KDE4::kdeui ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY}) # KSignalPlotter unit test set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) kde4_add_test(ksysguard-signalplottertest ${signalplottertest_SRCS} ) -target_link_libraries(ksysguard-signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(ksysguard-signalplottertest KDE4::kdeui ${QT_QTTEST_LIBRARY}) diff --git a/libs/kworkspace/CMakeLists.txt b/libs/kworkspace/CMakeLists.txt index ac2d9091..c24d73a4 100644 --- a/libs/kworkspace/CMakeLists.txt +++ b/libs/kworkspace/CMakeLists.txt @@ -24,8 +24,8 @@ target_link_libraries(kworkspace PRIVATE ) target_link_libraries(kworkspace PUBLIC - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ) set_target_properties(kworkspace PROPERTIES diff --git a/libs/oxygen/CMakeLists.txt b/libs/oxygen/CMakeLists.txt index 15ba38c8..32a7afba 100644 --- a/libs/oxygen/CMakeLists.txt +++ b/libs/oxygen/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_kcfg_files(oxygenstyle_LIB_SRCS add_library(oxygenstyle SHARED ${oxygenstyle_LIB_SRCS}) target_link_libraries(oxygenstyle PUBLIC - ${KDE4_KDEUI_LIBS} + KDE4::kdeui ) target_link_libraries(oxygenstyle PRIVATE ${X11_LIBRARIES}) @@ -41,7 +41,7 @@ kde4_add_kcfg_files(oxygenstyleconfig_LIB_SRCS add_library(oxygenstyleconfig SHARED ${oxygenstyleconfig_LIB_SRCS}) target_link_libraries(oxygenstyleconfig PUBLIC - ${KDE4_KDEUI_LIBS} + KDE4::kdeui oxygenstyle ) target_link_libraries(oxygenstyleconfig PRIVATE ${X11_LIBRARIES}) diff --git a/libs/plasmaclock/CMakeLists.txt b/libs/plasmaclock/CMakeLists.txt index f9e49931..474e5934 100644 --- a/libs/plasmaclock/CMakeLists.txt +++ b/libs/plasmaclock/CMakeLists.txt @@ -10,9 +10,9 @@ set(plasmaclock_LIB_SRCS add_library(plasmaclock SHARED ${plasmaclock_LIB_SRCS}) target_link_libraries(plasmaclock - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kdeui + KDE4::kio ) set_target_properties(plasmaclock PROPERTIES diff --git a/libs/plasmagenericshell/CMakeLists.txt b/libs/plasmagenericshell/CMakeLists.txt index ebcd12ed..84c5b351 100644 --- a/libs/plasmagenericshell/CMakeLists.txt +++ b/libs/plasmagenericshell/CMakeLists.txt @@ -43,9 +43,9 @@ set(plasmagenericshell_LIB_SRCS add_library(plasmagenericshell SHARED ${plasmagenericshell_LIB_SRCS}) target_link_libraries(plasmagenericshell PUBLIC - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::plasma + KDE4::kdeui + KDE4::kfile ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTUITOOLS_LIBRARY} diff --git a/libs/plasmagenericshell/tests/CMakeLists.txt b/libs/plasmagenericshell/tests/CMakeLists.txt index 7d18a1f0..7777aee4 100644 --- a/libs/plasmagenericshell/tests/CMakeLists.txt +++ b/libs/plasmagenericshell/tests/CMakeLists.txt @@ -13,9 +13,9 @@ set(appletexplorer_SRCS ) add_executable(plasmaappletexplorer ${appletexplorer_SRCS}) target_link_libraries(plasmaappletexplorer - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::plasma + KDE4::kdeui + KDE4::kfile ${QT_QTDECLARATIVE_LIBRARY} ) @@ -34,5 +34,5 @@ set(backgrounddialog_SRCS kde4_add_kcfg_files(backgrounddialog_SRCS ${CMAKE_SOURCE_DIR}/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc) add_executable(plasmabackgrounddialog ${backgrounddialog_SRCS}) -target_link_libraries(plasmabackgrounddialog ${KDE4_PLASMA_LIBS} ${QT_QTUITOOLS_LIBRARY} ${KDE4_KFILE_LIBS} kworkspace) +target_link_libraries(plasmabackgrounddialog KDE4::plasma ${QT_QTUITOOLS_LIBRARY} KDE4::kfile kworkspace) diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt index ef4891cd..8326a13e 100644 --- a/libs/taskmanager/CMakeLists.txt +++ b/libs/taskmanager/CMakeLists.txt @@ -31,8 +31,8 @@ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp) add_library(taskmanager SHARED ${taskmanager_LIB_SRCS}) target_link_libraries(taskmanager PUBLIC - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdeui + KDE4::kio processcore ) @@ -77,6 +77,6 @@ install(FILES #) #add_executable(tasksmodeltest ${tasksmodel_SRCS}) -#target_link_libraries(tasksmodeltest ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} taskmanager) +#target_link_libraries(tasksmodeltest KDE4::kdeui KDE4::kio ${X11_LIBRARIES} taskmanager) diff --git a/plasma/applets/analog-clock/CMakeLists.txt b/plasma/applets/analog-clock/CMakeLists.txt index 67aabf8d..732418ac 100644 --- a/plasma/applets/analog-clock/CMakeLists.txt +++ b/plasma/applets/analog-clock/CMakeLists.txt @@ -10,8 +10,8 @@ set(clock_SRCS kde4_add_plugin(plasma_applet_clock ${clock_SRCS}) target_link_libraries(plasma_applet_clock - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio plasmaclock ) diff --git a/plasma/applets/calendar/CMakeLists.txt b/plasma/applets/calendar/CMakeLists.txt index c6a3a1d9..e576d5eb 100644 --- a/plasma/applets/calendar/CMakeLists.txt +++ b/plasma/applets/calendar/CMakeLists.txt @@ -12,8 +12,8 @@ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) kde4_add_plugin(plasma_applet_calendar ${calendar_SRCS}) target_link_libraries(plasma_applet_calendar - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio plasmaclock ) diff --git a/plasma/applets/digital-clock/CMakeLists.txt b/plasma/applets/digital-clock/CMakeLists.txt index d8ffcac8..6cad5f69 100644 --- a/plasma/applets/digital-clock/CMakeLists.txt +++ b/plasma/applets/digital-clock/CMakeLists.txt @@ -12,9 +12,9 @@ set(clock_SRCS kde4_add_plugin(plasma_applet_dig_clock ${clock_SRCS}) target_link_libraries(plasma_applet_dig_clock - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kdeui + KDE4::kio plasmaclock ) diff --git a/plasma/applets/folderview/CMakeLists.txt b/plasma/applets/folderview/CMakeLists.txt index fb110aaa..6591a5cf 100644 --- a/plasma/applets/folderview/CMakeLists.txt +++ b/plasma/applets/folderview/CMakeLists.txt @@ -33,10 +33,10 @@ set(folderview_SRCS kde4_add_plugin(plasma_applet_folderview ${folderview_SRCS}) target_link_libraries(plasma_applet_folderview - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KFILE_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::plasma + KDE4::kio + KDE4::kfile + KDE4::solid ${X11_LIBRARIES} konq ) diff --git a/plasma/applets/icon/CMakeLists.txt b/plasma/applets/icon/CMakeLists.txt index a4391fda..93b09293 100644 --- a/plasma/applets/icon/CMakeLists.txt +++ b/plasma/applets/icon/CMakeLists.txt @@ -3,7 +3,7 @@ set(icon_SRCS icon.cpp) kde4_add_plugin(plasma_applet_icon ${icon_SRCS}) -target_link_libraries(plasma_applet_icon ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_applet_icon KDE4::plasma KDE4::kio) install(TARGETS plasma_applet_icon DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-icon.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/kickoff/CMakeLists.txt b/plasma/applets/kickoff/CMakeLists.txt index 0b36ef4a..5bed0592 100644 --- a/plasma/applets/kickoff/CMakeLists.txt +++ b/plasma/applets/kickoff/CMakeLists.txt @@ -31,10 +31,10 @@ QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${krunner_xml} krunner_interface) set(ksmserver_xml ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${ksmserver_xml} ksmserver_interface) -set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} kworkspace) +set(Kickoff_LIBS KDE4::kio KDE4::kfile KDE4::solid kworkspace) add_library(kickoff SHARED ${libkickoff_SRCS}) -target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS}) +target_link_libraries(kickoff KDE4::plasma ${Kickoff_LIBS}) generate_export_header(kickoff) @@ -68,7 +68,7 @@ set_source_files_properties( kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) target_link_libraries(plasma_applet_launcher - ${KDE4_PLASMA_LIBS} + KDE4::plasma ${QT_QTNETWORK_LIBRARY} ${Kickoff_LIBS} kickoff @@ -101,8 +101,8 @@ set_source_files_properties( kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) target_link_libraries(plasma_applet_simplelauncher - ${KDE4_KCMUTILS_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kcmutils + KDE4::plasma ${Kickoff_LIBS} kickoff ) @@ -121,6 +121,6 @@ install( #IF (CMAKE_BUILD_TYPE MATCHES Debug) # set(Application_SRCS ${Kickoff_SRCS} main.cpp) # add_executable(kickoff ${Application_SRCS}) -# target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS}) +# target_link_libraries(kickoff KDE4::plasma ${Kickoff_LIBS}) # install(TARGETS kickoff DESTINATION ${KDE4_BIN_INSTALL_DIR}) #ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/plasma/applets/pager/CMakeLists.txt b/plasma/applets/pager/CMakeLists.txt index 9b04e4af..2a14220e 100644 --- a/plasma/applets/pager/CMakeLists.txt +++ b/plasma/applets/pager/CMakeLists.txt @@ -14,9 +14,9 @@ set(pager_SRCS kde4_add_plugin(plasma_applet_pager ${pager_SRCS}) target_link_libraries(plasma_applet_pager - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kio + KDE4::plasma + KDE4::kcmutils ${QT_QTDECLARATIVE_LIBRARY} taskmanager ) diff --git a/plasma/applets/panelspacer/CMakeLists.txt b/plasma/applets/panelspacer/CMakeLists.txt index bfffd1ce..a33bdcac 100644 --- a/plasma/applets/panelspacer/CMakeLists.txt +++ b/plasma/applets/panelspacer/CMakeLists.txt @@ -4,7 +4,7 @@ set(panelspacer_SRCS panelspacer.cpp) kde4_add_plugin(plasma_applet_panelspacer_internal ${panelspacer_SRCS}) -target_link_libraries(plasma_applet_panelspacer_internal ${KDE4_PLASMA_LIBS}) +target_link_libraries(plasma_applet_panelspacer_internal KDE4::plasma) install(TARGETS plasma_applet_panelspacer_internal DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/applets/quicklaunch/CMakeLists.txt b/plasma/applets/quicklaunch/CMakeLists.txt index e77b8cda..445da65d 100644 --- a/plasma/applets/quicklaunch/CMakeLists.txt +++ b/plasma/applets/quicklaunch/CMakeLists.txt @@ -15,9 +15,9 @@ set(quicklaunch_SRCS kde4_add_plugin(plasma_applet_quicklaunch ${quicklaunch_SRCS}) target_link_libraries(plasma_applet_quicklaunch - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS}) + KDE4::plasma + KDE4::kdeui + KDE4::kio) install(TARGETS plasma_applet_quicklaunch DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-quicklaunch.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/system-monitor/CMakeLists.txt b/plasma/applets/system-monitor/CMakeLists.txt index e99c933b..360cdecc 100644 --- a/plasma/applets/system-monitor/CMakeLists.txt +++ b/plasma/applets/system-monitor/CMakeLists.txt @@ -11,8 +11,8 @@ set(lib_SRCS add_library(plasma_applet-system-monitor SHARED ${lib_SRCS}) target_link_libraries(plasma_applet-system-monitor - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::plasma + KDE4::kdeui ) set_target_properties(plasma_applet-system-monitor PROPERTIES @@ -29,7 +29,7 @@ set(hdd_SRCS hdd-config.ui ) kde4_add_plugin(plasma_applet_sm_hdd ${hdd_SRCS}) -target_link_libraries(plasma_applet_sm_hdd ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_hdd KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # HDD Activity Monitor @@ -38,7 +38,7 @@ set(hdd_activity_SRCS hdd_activity-config.ui ) kde4_add_plugin(plasma_applet_sm_hdd_activity ${hdd_activity_SRCS}) -target_link_libraries(plasma_applet_sm_hdd_activity ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_hdd_activity KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # Temperature Monitor @@ -48,7 +48,7 @@ set(temparature_SRCS temperature-config.ui ) kde4_add_plugin(plasma_applet_sm_temperature ${temparature_SRCS}) -target_link_libraries(plasma_applet_sm_temperature ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_temperature KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # Network Monitor @@ -57,7 +57,7 @@ set(net_SRCS net-config.ui ) kde4_add_plugin(plasma_applet_sm_net ${net_SRCS}) -target_link_libraries(plasma_applet_sm_net ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_net KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # CPU Monitor @@ -66,7 +66,7 @@ set(cpu_SRCS cpu-config.ui ) kde4_add_plugin(plasma_applet_sm_cpu ${cpu_SRCS}) -target_link_libraries(plasma_applet_sm_cpu ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_cpu KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # Harware Info @@ -74,7 +74,7 @@ set(hwinfo_SRCS hwinfo.cpp ) kde4_add_plugin(plasma_applet_sm_hwinfo ${hwinfo_SRCS}) -target_link_libraries(plasma_applet_sm_hwinfo ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_hwinfo KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # Ram Monitor @@ -84,7 +84,7 @@ set(ram_SRCS ) kde4_add_plugin(plasma_applet_sm_ram ${ram_SRCS}) -target_link_libraries(plasma_applet_sm_ram ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_sm_ram KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # Main applet @@ -93,7 +93,7 @@ set(system-monitor_SRCS monitorbutton.cpp ) kde4_add_plugin(plasma_applet_system-monitor ${system-monitor_SRCS}) -target_link_libraries(plasma_applet_system-monitor ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor) +target_link_libraries(plasma_applet_system-monitor KDE4::plasma KDE4::kdeui plasma_applet-system-monitor) # Install install( diff --git a/plasma/applets/systemtray/CMakeLists.txt b/plasma/applets/systemtray/CMakeLists.txt index 0a57e3e5..bf5ede8a 100644 --- a/plasma/applets/systemtray/CMakeLists.txt +++ b/plasma/applets/systemtray/CMakeLists.txt @@ -34,8 +34,8 @@ kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS}) include_directories(${CMAKE_SOURCE_DIR}) target_link_libraries(plasma_applet_systemtray ${QT_QTDECLARATIVE_LIBRARIES} - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${X11_LIBRARIES} ${X11_Xrender_LIB} ${X11_Xfixes_LIB} diff --git a/plasma/applets/tasks/CMakeLists.txt b/plasma/applets/tasks/CMakeLists.txt index 5c0da862..07aedf16 100644 --- a/plasma/applets/tasks/CMakeLists.txt +++ b/plasma/applets/tasks/CMakeLists.txt @@ -18,8 +18,8 @@ set(tasks_SRCS kde4_add_plugin(plasma_applet_tasks ${tasks_SRCS}) target_link_libraries(plasma_applet_tasks - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${QT_QTDECLARATIVE_LIBRARY} taskmanager ) diff --git a/plasma/applets/trash/CMakeLists.txt b/plasma/applets/trash/CMakeLists.txt index 89ffa60c..83d97d0a 100644 --- a/plasma/applets/trash/CMakeLists.txt +++ b/plasma/applets/trash/CMakeLists.txt @@ -4,7 +4,7 @@ set(trash_SRCS trash.cpp) kde4_add_plugin(plasma_applet_trash ${trash_SRCS}) -target_link_libraries(plasma_applet_trash ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS}) +target_link_libraries(plasma_applet_trash KDE4::plasma KDE4::solid KDE4::kfile KDE4::kio KDE4::kcmutils) install(TARGETS plasma_applet_trash DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-trash.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/windowlist/CMakeLists.txt b/plasma/applets/windowlist/CMakeLists.txt index 9f8993b3..6b9be713 100644 --- a/plasma/applets/windowlist/CMakeLists.txt +++ b/plasma/applets/windowlist/CMakeLists.txt @@ -10,8 +10,8 @@ set(windowlist_SRCS WindowList.cpp) kde4_add_plugin(plasma_applet_windowlist ${windowlist_SRCS}) target_link_libraries(plasma_applet_windowlist - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} + KDE4::plasma + KDE4::kdeui taskmanager kworkspace ) diff --git a/plasma/containmentactions/applauncher/CMakeLists.txt b/plasma/containmentactions/applauncher/CMakeLists.txt index 4b2b6cf2..9104af4e 100644 --- a/plasma/containmentactions/applauncher/CMakeLists.txt +++ b/plasma/containmentactions/applauncher/CMakeLists.txt @@ -5,7 +5,7 @@ set(applauncher_SRCS ) kde4_add_plugin(plasma_containmentactions_applauncher ${applauncher_SRCS}) -target_link_libraries(plasma_containmentactions_applauncher ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containmentactions_applauncher KDE4::plasma KDE4::kio) install(TARGETS plasma_containmentactions_applauncher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containmentactions-applauncher.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containmentactions/contextmenu/CMakeLists.txt b/plasma/containmentactions/contextmenu/CMakeLists.txt index c939cda6..8ae7c6f2 100644 --- a/plasma/containmentactions/contextmenu/CMakeLists.txt +++ b/plasma/containmentactions/contextmenu/CMakeLists.txt @@ -12,7 +12,7 @@ QT4_ADD_DBUS_INTERFACE(contextmenu_SRCS ${screensaver_xml} screensaver_interface kde4_add_plugin(plasma_containmentactions_contextmenu ${contextmenu_SRCS}) -target_link_libraries(plasma_containmentactions_contextmenu ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} kworkspace) +target_link_libraries(plasma_containmentactions_contextmenu KDE4::plasma KDE4::kio kworkspace) install(TARGETS plasma_containmentactions_contextmenu DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containmentactions-contextmenu.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt b/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt index f3127e1c..aa17503e 100644 --- a/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt +++ b/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt @@ -5,7 +5,7 @@ set(contextmenu_SRCS ) kde4_add_plugin(plasma_containmentactions_minimalcontextmenu ${contextmenu_SRCS}) -target_link_libraries(plasma_containmentactions_minimalcontextmenu ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containmentactions_minimalcontextmenu KDE4::plasma KDE4::kio) install(TARGETS plasma_containmentactions_minimalcontextmenu DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containmentactions-minimalcontextmenu.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containmentactions/paste/CMakeLists.txt b/plasma/containmentactions/paste/CMakeLists.txt index e2d871bf..9edc3caf 100644 --- a/plasma/containmentactions/paste/CMakeLists.txt +++ b/plasma/containmentactions/paste/CMakeLists.txt @@ -5,7 +5,7 @@ set(paste_SRCS ) kde4_add_plugin(plasma_containmentactions_paste ${paste_SRCS}) -target_link_libraries(plasma_containmentactions_paste ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containmentactions_paste KDE4::plasma KDE4::kio) install(TARGETS plasma_containmentactions_paste DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containmentactions-paste.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containmentactions/switchdesktop/CMakeLists.txt b/plasma/containmentactions/switchdesktop/CMakeLists.txt index 936601ac..b9f874fb 100644 --- a/plasma/containmentactions/switchdesktop/CMakeLists.txt +++ b/plasma/containmentactions/switchdesktop/CMakeLists.txt @@ -5,7 +5,7 @@ set(switchdesktop_SRCS ) kde4_add_plugin(plasma_containmentactions_switchdesktop ${switchdesktop_SRCS}) -target_link_libraries(plasma_containmentactions_switchdesktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containmentactions_switchdesktop KDE4::plasma KDE4::kio) install(TARGETS plasma_containmentactions_switchdesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containmentactions-switchdesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containmentactions/switchwindow/CMakeLists.txt b/plasma/containmentactions/switchwindow/CMakeLists.txt index 5bae2a02..45f0093f 100644 --- a/plasma/containmentactions/switchwindow/CMakeLists.txt +++ b/plasma/containmentactions/switchwindow/CMakeLists.txt @@ -6,7 +6,7 @@ set(switchwindow_SRCS ) kde4_add_plugin(plasma_containmentactions_switchwindow ${switchwindow_SRCS}) -target_link_libraries(plasma_containmentactions_switchwindow ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containmentactions_switchwindow KDE4::plasma KDE4::kio) install(TARGETS plasma_containmentactions_switchwindow DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containmentactions-switchwindow.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containments/desktop/CMakeLists.txt b/plasma/containments/desktop/CMakeLists.txt index 9d3b6b30..6f934396 100644 --- a/plasma/containments/desktop/CMakeLists.txt +++ b/plasma/containments/desktop/CMakeLists.txt @@ -7,7 +7,7 @@ set(krunner_xml ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml) QT4_ADD_DBUS_INTERFACE(desktop_SRCS ${krunner_xml} krunner_interface) kde4_add_plugin(plasma_containment_desktop ${desktop_SRCS}) -target_link_libraries(plasma_containment_desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) +target_link_libraries(plasma_containment_desktop KDE4::plasma KDE4::kio KDE4::kfile) install(TARGETS plasma_containment_desktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containment-desktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containments/newspaper/CMakeLists.txt b/plasma/containments/newspaper/CMakeLists.txt index 9031bb4e..361c332b 100644 --- a/plasma/containments/newspaper/CMakeLists.txt +++ b/plasma/containments/newspaper/CMakeLists.txt @@ -10,7 +10,7 @@ set(newspaper_SRCS ) kde4_add_plugin(plasma_containment_newspaper ${newspaper_SRCS}) -target_link_libraries(plasma_containment_newspaper ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containment_newspaper KDE4::plasma KDE4::kio) install(TARGETS plasma_containment_newspaper DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containment-newspaper.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containments/panel/CMakeLists.txt b/plasma/containments/panel/CMakeLists.txt index acacd5bf..1b1acf98 100644 --- a/plasma/containments/panel/CMakeLists.txt +++ b/plasma/containments/panel/CMakeLists.txt @@ -4,7 +4,7 @@ set(panel_SRCS ) kde4_add_plugin(plasma_containment_panel ${panel_SRCS}) -target_link_libraries(plasma_containment_panel ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_containment_panel KDE4::plasma KDE4::kio) install(TARGETS plasma_containment_panel DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-containment-panel.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/applicationjobs/CMakeLists.txt b/plasma/dataengines/applicationjobs/CMakeLists.txt index cd0cf726..8b1ccf01 100644 --- a/plasma/dataengines/applicationjobs/CMakeLists.txt +++ b/plasma/dataengines/applicationjobs/CMakeLists.txt @@ -23,9 +23,9 @@ qt4_add_dbus_adaptor(kuiserver_engine_SRCS kde4_add_plugin(plasma_engine_applicationjobs ${kuiserver_engine_SRCS}) target_link_libraries(plasma_engine_applicationjobs - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::kio + KDE4::plasma ) install( diff --git a/plasma/dataengines/apps/CMakeLists.txt b/plasma/dataengines/apps/CMakeLists.txt index bdae18be..9a6a578c 100644 --- a/plasma/dataengines/apps/CMakeLists.txt +++ b/plasma/dataengines/apps/CMakeLists.txt @@ -6,7 +6,7 @@ set(apps_engine_SRCS ) kde4_add_plugin(plasma_engine_apps ${apps_engine_SRCS}) -target_link_libraries(plasma_engine_apps ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_engine_apps KDE4::kdeui KDE4::plasma KDE4::kio) install(TARGETS plasma_engine_apps DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-apps.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/devicenotifications/CMakeLists.txt b/plasma/dataengines/devicenotifications/CMakeLists.txt index 472fb016..4c0d612f 100644 --- a/plasma/dataengines/devicenotifications/CMakeLists.txt +++ b/plasma/dataengines/devicenotifications/CMakeLists.txt @@ -6,7 +6,7 @@ qt4_add_dbus_adaptor( device_notifications_engine_SRCS org.kde.DeviceNotificatio kde4_add_plugin(plasma_engine_devicenotifications ${device_notifications_engine_SRCS}) -target_link_libraries(plasma_engine_devicenotifications ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS}) +target_link_libraries(plasma_engine_devicenotifications KDE4::plasma KDE4::kdecore) install(TARGETS plasma_engine_devicenotifications DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-devicenotifications.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/dict/CMakeLists.txt b/plasma/dataengines/dict/CMakeLists.txt index f34d2703..102d6dc8 100644 --- a/plasma/dataengines/dict/CMakeLists.txt +++ b/plasma/dataengines/dict/CMakeLists.txt @@ -5,7 +5,7 @@ set(dict_engine_SRCS ) kde4_add_plugin(plasma_engine_dict ${dict_engine_SRCS}) -target_link_libraries(plasma_engine_dict ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTNETWORK_LIBRARY}) +target_link_libraries(plasma_engine_dict KDE4::kdecore KDE4::plasma ${QT_QTNETWORK_LIBRARY}) install(TARGETS plasma_engine_dict DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-dict.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/favicons/CMakeLists.txt b/plasma/dataengines/favicons/CMakeLists.txt index e9220e4e..ebb8bbbc 100644 --- a/plasma/dataengines/favicons/CMakeLists.txt +++ b/plasma/dataengines/favicons/CMakeLists.txt @@ -3,7 +3,7 @@ set(favicons_engine_SRCS ) kde4_add_plugin(plasma_engine_favicons ${favicons_engine_SRCS} ) -target_link_libraries(plasma_engine_favicons ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS}) +target_link_libraries(plasma_engine_favicons KDE4::plasma KDE4::kdecore) install(TARGETS plasma_engine_favicons DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install(FILES plasma-dataengine-favicons.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/filebrowser/CMakeLists.txt b/plasma/dataengines/filebrowser/CMakeLists.txt index 772d7b51..25037967 100644 --- a/plasma/dataengines/filebrowser/CMakeLists.txt +++ b/plasma/dataengines/filebrowser/CMakeLists.txt @@ -3,7 +3,7 @@ set(filebrowser_engine_SRCS ) kde4_add_plugin(plasma_engine_filebrowser ${filebrowser_engine_SRCS}) -target_link_libraries(plasma_engine_filebrowser ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(plasma_engine_filebrowser KDE4::kdecore KDE4::kio KDE4::plasma) install(TARGETS plasma_engine_filebrowser DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-filebrowser.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/geolocation/CMakeLists.txt b/plasma/dataengines/geolocation/CMakeLists.txt index b117a310..3f86f6db 100644 --- a/plasma/dataengines/geolocation/CMakeLists.txt +++ b/plasma/dataengines/geolocation/CMakeLists.txt @@ -5,8 +5,8 @@ project(geolocation) set(plasma_geolocation_interface_SRCS geolocationprovider.cpp) add_library(plasma-geolocation-interface SHARED ${plasma_geolocation_interface_SRCS}) target_link_libraries(plasma-geolocation-interface PUBLIC - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kio + KDE4::plasma ) set_target_properties(plasma-geolocation-interface PROPERTIES @@ -36,10 +36,10 @@ set(plasma_dataengine_geolocation_SRCS geolocation.cpp) kde4_add_plugin(plasma_engine_geolocation ${plasma_dataengine_geolocation_SRCS}) target_link_libraries(plasma_engine_geolocation plasma-geolocation-interface - ${KDE4_PLASMA_LIBS} - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::plasma + KDE4::kdecore + KDE4::kio + KDE4::solid ) install(TARGETS plasma_engine_geolocation DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/dataengines/hotplug/CMakeLists.txt b/plasma/dataengines/hotplug/CMakeLists.txt index 80ddd918..697f7bd3 100644 --- a/plasma/dataengines/hotplug/CMakeLists.txt +++ b/plasma/dataengines/hotplug/CMakeLists.txt @@ -6,10 +6,10 @@ set(hotplug_engine_SRCS kde4_add_plugin(plasma_engine_hotplug ${hotplug_engine_SRCS}) target_link_libraries(plasma_engine_hotplug - ${KDE4_PLASMA_LIBS} - ${KDE4_KDECORE_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kdecore + KDE4::solid + KDE4::kio ) install( diff --git a/plasma/dataengines/mpris2/CMakeLists.txt b/plasma/dataengines/mpris2/CMakeLists.txt index 76735439..bb47c47d 100644 --- a/plasma/dataengines/mpris2/CMakeLists.txt +++ b/plasma/dataengines/mpris2/CMakeLists.txt @@ -21,7 +21,7 @@ qt4_add_dbus_interface(mpris2_engine_SRCS org.mpris.MediaPlayer2.xml mprisroot) kde4_add_plugin(plasma_engine_mpris2 ${mpris2_engine_SRCS}) target_link_libraries(plasma_engine_mpris2 - ${KDE4_PLASMA_LIBS} + KDE4::plasma ) install(TARGETS plasma_engine_mpris2 DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/dataengines/notifications/CMakeLists.txt b/plasma/dataengines/notifications/CMakeLists.txt index 8469c042..258d7abd 100644 --- a/plasma/dataengines/notifications/CMakeLists.txt +++ b/plasma/dataengines/notifications/CMakeLists.txt @@ -8,7 +8,7 @@ qt4_add_dbus_adaptor( notifications_engine_SRCS org.freedesktop.Notifications.xm kde4_add_plugin(plasma_engine_notifications ${notifications_engine_SRCS}) -target_link_libraries(plasma_engine_notifications ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS}) +target_link_libraries(plasma_engine_notifications KDE4::plasma KDE4::kdecore KDE4::knotifyconfig) install(TARGETS plasma_engine_notifications DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-notifications.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/places/CMakeLists.txt b/plasma/dataengines/places/CMakeLists.txt index c868a1f0..e0a9fadb 100644 --- a/plasma/dataengines/places/CMakeLists.txt +++ b/plasma/dataengines/places/CMakeLists.txt @@ -8,9 +8,9 @@ kde4_add_plugin(plasma_engine_places ${places_engine_SRCS}) target_link_libraries(plasma_engine_places plasma - ${KDE4_KIO_LIBS} - ${KDE4_KFILE_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kio + KDE4::kfile + KDE4::solid ) install( diff --git a/plasma/dataengines/powermanagement/CMakeLists.txt b/plasma/dataengines/powermanagement/CMakeLists.txt index 2bb08bb2..f99ebfc5 100644 --- a/plasma/dataengines/powermanagement/CMakeLists.txt +++ b/plasma/dataengines/powermanagement/CMakeLists.txt @@ -9,7 +9,7 @@ set(krunner_xml ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml) QT4_ADD_DBUS_INTERFACE(powermanagement_engine_SRCS ${krunner_xml} krunner_interface) kde4_add_plugin(plasma_engine_powermanagement ${powermanagement_engine_SRCS}) -target_link_libraries(plasma_engine_powermanagement ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KIDLETIME_LIBS} kworkspace) +target_link_libraries(plasma_engine_powermanagement KDE4::kdecore KDE4::solid KDE4::plasma KDE4::kidletime kworkspace) install(TARGETS plasma_engine_powermanagement DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-powermanagement.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/soliddevice/CMakeLists.txt b/plasma/dataengines/soliddevice/CMakeLists.txt index a8ca36fa..e5a9c80f 100644 --- a/plasma/dataengines/soliddevice/CMakeLists.txt +++ b/plasma/dataengines/soliddevice/CMakeLists.txt @@ -8,11 +8,11 @@ set(soliddevice_engine_SRCS kde4_add_plugin(plasma_engine_soliddevice ${soliddevice_engine_SRCS}) target_link_libraries(plasma_engine_soliddevice - ${KDE4_KDECORE_LIBS} - ${KDE4_SOLID_LIBS} + KDE4::kdecore + KDE4::solid ${QT_QTNETWORK_LIBRARY} - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio ) install(TARGETS plasma_engine_soliddevice DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/dataengines/statusnotifieritem/CMakeLists.txt b/plasma/dataengines/statusnotifieritem/CMakeLists.txt index fcef7135..be2f7412 100644 --- a/plasma/dataengines/statusnotifieritem/CMakeLists.txt +++ b/plasma/dataengines/statusnotifieritem/CMakeLists.txt @@ -24,7 +24,7 @@ set_source_files_properties(${statusnotifieritem_xml} PROPERTIES QT4_ADD_DBUS_INTERFACE(statusnotifieritem_engine_SRCS ${statusnotifieritem_xml} statusnotifieritem_interface) kde4_add_plugin(plasma_engine_statusnotifieritem ${statusnotifieritem_engine_SRCS}) -target_link_libraries(plasma_engine_statusnotifieritem ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(plasma_engine_statusnotifieritem KDE4::kdeui KDE4::plasma) install(TARGETS plasma_engine_statusnotifieritem DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma_engine_statusnotifieritem.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/systemmonitor/CMakeLists.txt b/plasma/dataengines/systemmonitor/CMakeLists.txt index c3e80a10..4119d69e 100644 --- a/plasma/dataengines/systemmonitor/CMakeLists.txt +++ b/plasma/dataengines/systemmonitor/CMakeLists.txt @@ -4,7 +4,7 @@ set(systemmonitor_engine_SRCS ) kde4_add_plugin(plasma_engine_systemmonitor ${systemmonitor_engine_SRCS}) -target_link_libraries(plasma_engine_systemmonitor ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY} ksgrd) +target_link_libraries(plasma_engine_systemmonitor KDE4::plasma KDE4::kdecore ${QT_QTNETWORK_LIBRARY} ksgrd) install(TARGETS plasma_engine_systemmonitor DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-systemmonitor.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/tasks/CMakeLists.txt b/plasma/dataengines/tasks/CMakeLists.txt index ea913a93..ea769271 100644 --- a/plasma/dataengines/tasks/CMakeLists.txt +++ b/plasma/dataengines/tasks/CMakeLists.txt @@ -14,8 +14,8 @@ set(tasks_engine_SRCS kde4_add_plugin(plasma_engine_tasks ${tasks_engine_SRCS}) target_link_libraries(plasma_engine_tasks - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma taskmanager ) diff --git a/plasma/dataengines/time/CMakeLists.txt b/plasma/dataengines/time/CMakeLists.txt index 72fc405d..dfe6c821 100644 --- a/plasma/dataengines/time/CMakeLists.txt +++ b/plasma/dataengines/time/CMakeLists.txt @@ -5,7 +5,7 @@ set(time_engine_SRCS ) kde4_add_plugin(plasma_engine_time ${time_engine_SRCS}) -target_link_libraries(plasma_engine_time ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries(plasma_engine_time KDE4::kdecore KDE4::plasma KDE4::solid) install(TARGETS plasma_engine_time DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-time.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/weather/CMakeLists.txt b/plasma/dataengines/weather/CMakeLists.txt index cef7f9aa..12ad724e 100644 --- a/plasma/dataengines/weather/CMakeLists.txt +++ b/plasma/dataengines/weather/CMakeLists.txt @@ -7,9 +7,9 @@ ADD_SUBDIRECTORY(ions) SET(weather_SRCS weatherengine.cpp) kde4_add_plugin(plasma_engine_weather ${weather_SRCS}) TARGET_LINK_LIBRARIES(plasma_engine_weather - ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kio + KDE4::solid + KDE4::plasma weather_ion ) diff --git a/plasma/dataengines/weather/ions/CMakeLists.txt b/plasma/dataengines/weather/ions/CMakeLists.txt index 050a7e28..5e24bee4 100644 --- a/plasma/dataengines/weather/ions/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/CMakeLists.txt @@ -2,9 +2,9 @@ set(ionlib_SRCS ion.cpp) add_library(weather_ion SHARED ${ionlib_SRCS}) target_link_libraries(weather_ion PUBLIC - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::kio + KDE4::plasma ) set_target_properties(weather_ion PROPERTIES diff --git a/plasma/dataengines/weather/ions/noaa/CMakeLists.txt b/plasma/dataengines/weather/ions/noaa/CMakeLists.txt index ac5be088..888b808c 100644 --- a/plasma/dataengines/weather/ions/noaa/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/noaa/CMakeLists.txt @@ -1,6 +1,6 @@ SET (ion_noaa_SRCS ion_noaa.cpp ../dataengineconsumer.cpp) kde4_add_plugin(ion_noaa ${ion_noaa_SRCS}) -target_link_libraries (ion_noaa ${KDE4_SOLID_LIBS} weather_ion) +target_link_libraries (ion_noaa KDE4::solid weather_ion) INSTALL (FILES ion-noaa.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt b/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt index fe34fcf6..a44f4478 100644 --- a/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt @@ -1,6 +1,6 @@ set(ion_wettercom_SRCS ion_wettercom.cpp) kde4_add_plugin(ion_wettercom ${ion_wettercom_SRCS}) -target_link_libraries(ion_wettercom weather_ion ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(ion_wettercom weather_ion KDE4::kdecore KDE4::plasma KDE4::kio) install(FILES ion-wettercom.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(TARGETS ion_wettercom DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/declarativeimports/core/CMakeLists.txt b/plasma/declarativeimports/core/CMakeLists.txt index 45d5a64a..2f15af36 100644 --- a/plasma/declarativeimports/core/CMakeLists.txt +++ b/plasma/declarativeimports/core/CMakeLists.txt @@ -25,8 +25,8 @@ include_directories( add_library(corebindingsplugin SHARED ${corebindings_SRCS}) target_link_libraries(corebindingsplugin - ${KDE4_PLASMA_LIBS} - ${KDE4_KDECLARATIVE_LIBS} + KDE4::plasma + KDE4::kdeclarative ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ) diff --git a/plasma/declarativeimports/core/tests/CMakeLists.txt b/plasma/declarativeimports/core/tests/CMakeLists.txt index 8f80de09..ae7ef313 100644 --- a/plasma/declarativeimports/core/tests/CMakeLists.txt +++ b/plasma/declarativeimports/core/tests/CMakeLists.txt @@ -10,7 +10,7 @@ kde4_add_test(sortfiltermodeltest ) target_link_libraries(sortfiltermodeltest - ${KDE4_PLASMA_LIBS} + KDE4::plasma ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ) @@ -24,4 +24,4 @@ set(runnermodeltest_SRCS #add_library(datamodelsplugin SHARED ${datamodels_SRCS}) add_executable(runnermodeltest ${runnermodeltest_SRCS}) -target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} ${KDE4_PLASMA_LIBS}) +target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} KDE4::plasma) diff --git a/plasma/declarativeimports/dirmodel/CMakeLists.txt b/plasma/declarativeimports/dirmodel/CMakeLists.txt index 0d342d46..5d4a439d 100644 --- a/plasma/declarativeimports/dirmodel/CMakeLists.txt +++ b/plasma/declarativeimports/dirmodel/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(dirmodelplugin SHARED ${dirmodel_SRCS}) target_link_libraries(dirmodelplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - ${KDE4_KIO_LIBS} + KDE4::kio ) install(TARGETS dirmodelplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/dirmodel) diff --git a/plasma/declarativeimports/graphicswidgets/CMakeLists.txt b/plasma/declarativeimports/graphicswidgets/CMakeLists.txt index c818d3da..d00d43da 100644 --- a/plasma/declarativeimports/graphicswidgets/CMakeLists.txt +++ b/plasma/declarativeimports/graphicswidgets/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( add_library(graphicswidgetsbindingsplugin SHARED ${graphicswidgetsbindings_SRCS}) target_link_libraries(graphicswidgetsbindingsplugin - ${KDE4_PLASMA_LIBS} + KDE4::plasma ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ) diff --git a/plasma/declarativeimports/locale/CMakeLists.txt b/plasma/declarativeimports/locale/CMakeLists.txt index c935c3b9..aae48962 100644 --- a/plasma/declarativeimports/locale/CMakeLists.txt +++ b/plasma/declarativeimports/locale/CMakeLists.txt @@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES( add_library(localebindingsplugin SHARED ${localebindings_SRCS}) -target_link_libraries(localebindingsplugin ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDECORE_LIBS}) +target_link_libraries(localebindingsplugin ${QT_QTDECLARATIVE_LIBRARY} KDE4::kdecore) install(TARGETS localebindingsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/locale) install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/locale) diff --git a/plasma/declarativeimports/plasmacomponents/CMakeLists.txt b/plasma/declarativeimports/plasmacomponents/CMakeLists.txt index 6a9a7cf8..3fd28eb1 100644 --- a/plasma/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/plasma/declarativeimports/plasmacomponents/CMakeLists.txt @@ -23,9 +23,9 @@ target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} - ${KDE4_KDEUI_LIBS} - ${KDE4_KDECLARATIVE_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::kdeclarative + KDE4::plasma ) install(TARGETS plasmacomponentsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/components) diff --git a/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt b/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt index bdaabf9f..8960f66c 100644 --- a/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt +++ b/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt @@ -8,7 +8,7 @@ set(plasmaextracomponents_SRCS add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS}) target_link_libraries(plasmaextracomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - ${QT_QTGUI_LIBRARY} ${KDE4_PLASMA_LIBS} ) + ${QT_QTGUI_LIBRARY} KDE4::plasma ) install(TARGETS plasmaextracomponentsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/extras) diff --git a/plasma/declarativeimports/qtextracomponents/CMakeLists.txt b/plasma/declarativeimports/qtextracomponents/CMakeLists.txt index c7659e37..b54d3f98 100644 --- a/plasma/declarativeimports/qtextracomponents/CMakeLists.txt +++ b/plasma/declarativeimports/qtextracomponents/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ) add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS}) -target_link_libraries(qtextracomponentsplugin ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) +target_link_libraries(qtextracomponentsplugin KDE4::kdeui ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) install(TARGETS qtextracomponentsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) diff --git a/plasma/declarativeimports/qtextracomponents/tests/CMakeLists.txt b/plasma/declarativeimports/qtextracomponents/tests/CMakeLists.txt index 650b30db..1d755ea3 100644 --- a/plasma/declarativeimports/qtextracomponents/tests/CMakeLists.txt +++ b/plasma/declarativeimports/qtextracomponents/tests/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries(fullmodelaccesstest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ) diff --git a/plasma/kpart/CMakeLists.txt b/plasma/kpart/CMakeLists.txt index 0b7c96e9..1bf6e85d 100644 --- a/plasma/kpart/CMakeLists.txt +++ b/plasma/kpart/CMakeLists.txt @@ -14,7 +14,7 @@ set(plasma_kpart_SRCS kde4_add_plugin(plasma-kpart ${plasma_kpart_SRCS}) -target_link_libraries(plasma-kpart ${QT_QTSCRIPT_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ) +target_link_libraries(plasma-kpart ${QT_QTSCRIPT_LIBRARY} KDE4::plasma KDE4::kio ${X11_LIBRARIES} KDE4::kfile KDE4::kparts ) install(TARGETS plasma-kpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-kpart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/bookmarks/CMakeLists.txt b/plasma/runners/bookmarks/CMakeLists.txt index 912d67ca..3dc97541 100644 --- a/plasma/runners/bookmarks/CMakeLists.txt +++ b/plasma/runners/bookmarks/CMakeLists.txt @@ -12,8 +12,8 @@ set(krunner_bookmarksrunner_SRCS kde4_add_plugin(krunner_bookmarksrunner ${krunner_bookmarksrunner_SRCS}) target_link_libraries(krunner_bookmarksrunner - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kio + KDE4::plasma ${QT_QTSCRIPT_LIBRARY} ${QT_QTDBUS_LIBRARY} ) diff --git a/plasma/runners/bookmarks/tests/CMakeLists.txt b/plasma/runners/bookmarks/tests/CMakeLists.txt index 30695cd0..747b3190 100644 --- a/plasma/runners/bookmarks/tests/CMakeLists.txt +++ b/plasma/runners/bookmarks/tests/CMakeLists.txt @@ -13,9 +13,9 @@ include_directories( kde4_add_test(plasma-runner-bookmarks-TestChromeBookmarks ${testChromeBookmarks_SRCS}) target_link_libraries(plasma-runner-bookmarks-TestChromeBookmarks - ${KDE4_KDECORE_LIBS} - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdecore + KDE4::plasma + KDE4::kio ${QT_QTTEST_LIBRARY} ${QT_QTDBUS_LIBRARY} ) diff --git a/plasma/runners/calculator/CMakeLists.txt b/plasma/runners/calculator/CMakeLists.txt index fbec32db..d8ba4d1d 100644 --- a/plasma/runners/calculator/CMakeLists.txt +++ b/plasma/runners/calculator/CMakeLists.txt @@ -19,15 +19,15 @@ endif( QALCULATE_FOUND ) kde4_add_plugin(krunner_calculatorrunner ${krunner_calculatorrunner_SRCS}) target_link_libraries(krunner_calculatorrunner - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kdeui + KDE4::plasma ${QT_QTSCRIPT_LIBRARY} ) if ( QALCULATE_FOUND ) target_link_libraries(krunner_calculatorrunner - ${KDE4_SOLID_LIBS} - ${KDE4_KIO_LIBS} + KDE4::solid + KDE4::kio ${QALCULATE_LIBRARIES} ) endif ( QALCULATE_FOUND ) diff --git a/plasma/runners/kill/CMakeLists.txt b/plasma/runners/kill/CMakeLists.txt index 8e202928..0078d53f 100644 --- a/plasma/runners/kill/CMakeLists.txt +++ b/plasma/runners/kill/CMakeLists.txt @@ -7,17 +7,17 @@ set(kcm_krunner_kill_SRCS ) kde4_add_plugin(kcm_krunner_kill ${kcm_krunner_kill_SRCS}) target_link_libraries(kcm_krunner_kill - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kdecore + KDE4::kdeui + KDE4::kcmutils ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) kde4_add_plugin(krunner_kill ${krunner_kill_SRCS}) target_link_libraries(krunner_kill - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio processcore ) diff --git a/plasma/runners/locations/CMakeLists.txt b/plasma/runners/locations/CMakeLists.txt index c947e826..b911ebcc 100644 --- a/plasma/runners/locations/CMakeLists.txt +++ b/plasma/runners/locations/CMakeLists.txt @@ -3,7 +3,7 @@ set(krunner_locations_SRCS ) kde4_add_plugin(krunner_locations ${krunner_locations_SRCS}) -target_link_libraries(krunner_locations ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_locations KDE4::kio KDE4::plasma) install(TARGETS krunner_locations DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/places/CMakeLists.txt b/plasma/runners/places/CMakeLists.txt index 19fb1ec8..f15cd49c 100644 --- a/plasma/runners/places/CMakeLists.txt +++ b/plasma/runners/places/CMakeLists.txt @@ -6,10 +6,10 @@ set(krunner_placesrunner_SRCS kde4_add_plugin(krunner_placesrunner ${krunner_placesrunner_SRCS}) target_link_libraries( krunner_placesrunner - ${KDE4_KFILE_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_PLASMA_LIBS} + KDE4::kfile + KDE4::solid + KDE4::kio + KDE4::plasma ) install(TARGETS krunner_placesrunner DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/plasma-desktop/CMakeLists.txt b/plasma/runners/plasma-desktop/CMakeLists.txt index 2c138572..c55de660 100644 --- a/plasma/runners/plasma-desktop/CMakeLists.txt +++ b/plasma/runners/plasma-desktop/CMakeLists.txt @@ -3,7 +3,7 @@ set(krunner_plasma-desktop_SRCS ) kde4_add_plugin(krunner_plasma-desktop ${krunner_plasma-desktop_SRCS}) -target_link_libraries(krunner_plasma-desktop ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_plasma-desktop KDE4::kio KDE4::plasma) install(TARGETS krunner_plasma-desktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-runner-plasma-desktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/powerdevil/CMakeLists.txt b/plasma/runners/powerdevil/CMakeLists.txt index e48a8b8d..41daa7d1 100644 --- a/plasma/runners/powerdevil/CMakeLists.txt +++ b/plasma/runners/powerdevil/CMakeLists.txt @@ -7,7 +7,7 @@ set(krunner_powerdevil_SRCS ) kde4_add_plugin(krunner_powerdevil ${krunner_powerdevil_SRCS}) -target_link_libraries(krunner_powerdevil ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries(krunner_powerdevil KDE4::kdeui KDE4::kio KDE4::plasma KDE4::solid) install(TARGETS krunner_powerdevil DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/runners/recentdocuments/CMakeLists.txt b/plasma/runners/recentdocuments/CMakeLists.txt index 18880de8..3c39620c 100644 --- a/plasma/runners/recentdocuments/CMakeLists.txt +++ b/plasma/runners/recentdocuments/CMakeLists.txt @@ -3,7 +3,7 @@ set(krunner_recentdocuments_SRCS ) kde4_add_plugin(krunner_recentdocuments ${krunner_recentdocuments_SRCS}) -target_link_libraries(krunner_recentdocuments ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(krunner_recentdocuments KDE4::plasma KDE4::kio) install(TARGETS krunner_recentdocuments DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/services/CMakeLists.txt b/plasma/runners/services/CMakeLists.txt index 87143afc..3d693fe6 100644 --- a/plasma/runners/services/CMakeLists.txt +++ b/plasma/runners/services/CMakeLists.txt @@ -3,7 +3,7 @@ set(krunner_services_SRCS ) kde4_add_plugin(krunner_services ${krunner_services_SRCS}) -target_link_libraries(krunner_services ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_services KDE4::kio KDE4::plasma) install(TARGETS krunner_services DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/sessions/CMakeLists.txt b/plasma/runners/sessions/CMakeLists.txt index c6c52416..cdb3903c 100644 --- a/plasma/runners/sessions/CMakeLists.txt +++ b/plasma/runners/sessions/CMakeLists.txt @@ -6,7 +6,7 @@ set(screensaver_xml ${CMAKE_SOURCE_DIR}/kscreensaver/org.freedesktop.ScreenSaver QT4_ADD_DBUS_INTERFACE(krunner_sessions_SRCS ${screensaver_xml} screensaver_interface) kde4_add_plugin(krunner_sessions ${krunner_sessions_SRCS}) -target_link_libraries(krunner_sessions ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} kworkspace) +target_link_libraries(krunner_sessions KDE4::kio KDE4::plasma kworkspace) install(TARGETS krunner_sessions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/shell/CMakeLists.txt b/plasma/runners/shell/CMakeLists.txt index a32d68d9..0b185a3d 100644 --- a/plasma/runners/shell/CMakeLists.txt +++ b/plasma/runners/shell/CMakeLists.txt @@ -4,7 +4,7 @@ set(krunner_shell_SRCS ) kde4_add_plugin(krunner_shell ${krunner_shell_SRCS}) -target_link_libraries(krunner_shell ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_shell KDE4::kio KDE4::plasma) install(TARGETS krunner_shell DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-runner-shell.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/solid/CMakeLists.txt b/plasma/runners/solid/CMakeLists.txt index 6e0e6c3c..513b33f3 100644 --- a/plasma/runners/solid/CMakeLists.txt +++ b/plasma/runners/solid/CMakeLists.txt @@ -4,7 +4,7 @@ set(krunner_solid_SRCS ) kde4_add_plugin(krunner_solid ${krunner_solid_SRCS}) -target_link_libraries(krunner_solid ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(krunner_solid KDE4::kdeui KDE4::plasma KDE4::solid KDE4::kio) install(TARGETS krunner_solid DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/webshortcuts/CMakeLists.txt b/plasma/runners/webshortcuts/CMakeLists.txt index 44c7d7e4..f3a0cb63 100644 --- a/plasma/runners/webshortcuts/CMakeLists.txt +++ b/plasma/runners/webshortcuts/CMakeLists.txt @@ -3,7 +3,7 @@ set(krunner_webshortcuts_SRCS ) kde4_add_plugin(krunner_webshortcuts ${krunner_webshortcuts_SRCS}) -target_link_libraries(krunner_webshortcuts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_webshortcuts KDE4::kio KDE4::plasma) install(TARGETS krunner_webshortcuts DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/runners/windowedwidgets/CMakeLists.txt b/plasma/runners/windowedwidgets/CMakeLists.txt index bbbd3836..d067b134 100644 --- a/plasma/runners/windowedwidgets/CMakeLists.txt +++ b/plasma/runners/windowedwidgets/CMakeLists.txt @@ -7,7 +7,7 @@ set(krunner_windowedwidgets_SRCS ) kde4_add_plugin(krunner_windowedwidgets ${krunner_windowedwidgets_SRCS}) -target_link_libraries(krunner_windowedwidgets ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_windowedwidgets KDE4::plasma) install(TARGETS krunner_windowedwidgets DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-runner-windowedwidgets.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/windows/CMakeLists.txt b/plasma/runners/windows/CMakeLists.txt index f2302b04..50e0c49c 100644 --- a/plasma/runners/windows/CMakeLists.txt +++ b/plasma/runners/windows/CMakeLists.txt @@ -3,7 +3,7 @@ set(krunner_windows_SRCS ) kde4_add_plugin(krunner_windows ${krunner_windows_SRCS}) -target_link_libraries(krunner_windows ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) +target_link_libraries(krunner_windows KDE4::kdeui KDE4::plasma) install(TARGETS krunner_windows DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) diff --git a/plasma/scriptengine/CMakeLists.txt b/plasma/scriptengine/CMakeLists.txt index b15f693b..0eaf3655 100644 --- a/plasma/scriptengine/CMakeLists.txt +++ b/plasma/scriptengine/CMakeLists.txt @@ -32,8 +32,8 @@ set_source_files_properties( kde4_add_plugin(plasma_appletscript_declarative ${declarative_appletscript_SRCS}) target_link_libraries(plasma_appletscript_declarative - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTUITOOLS_LIBRARY} diff --git a/plasma/shells/plasma-desktop/CMakeLists.txt b/plasma/shells/plasma-desktop/CMakeLists.txt index 649208fa..72cbd1ab 100644 --- a/plasma/shells/plasma-desktop/CMakeLists.txt +++ b/plasma/shells/plasma-desktop/CMakeLists.txt @@ -36,11 +36,11 @@ qt4_add_dbus_interface(plasma_SRCS ${ksmserver_xml} ksmserver_interface) add_executable(plasma-desktop ${plasma_SRCS}) target_link_libraries(plasma-desktop - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KFILE_LIBS} - ${KDE4_KTEXTEDITOR_LIBS} - ${KDE4_KIDLETIME_LIBS} + KDE4::plasma + KDE4::kio + KDE4::kfile + KDE4::ktexteditor + KDE4::kidletime ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${X11_LIBRARIES} diff --git a/plasma/shells/plasma-windowed/CMakeLists.txt b/plasma/shells/plasma-windowed/CMakeLists.txt index f45ea4cf..940f3b99 100644 --- a/plasma/shells/plasma-windowed/CMakeLists.txt +++ b/plasma/shells/plasma-windowed/CMakeLists.txt @@ -14,10 +14,10 @@ set(plasma-windowed_SRCS add_executable(plasma-windowed ${plasma-windowed_SRCS}) target_link_libraries(plasma-windowed - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} + KDE4::plasma + KDE4::kio ${X11_LIBRARIES} - ${KDE4_KFILE_LIBS} + KDE4::kfile kworkspace ) diff --git a/plasma/toolboxes/CMakeLists.txt b/plasma/toolboxes/CMakeLists.txt index f4e9b494..3008ec0a 100644 --- a/plasma/toolboxes/CMakeLists.txt +++ b/plasma/toolboxes/CMakeLists.txt @@ -5,7 +5,7 @@ set(desktoptoolbox_SRCS internaltoolbox.cpp desktoptoolbox.cpp) kde4_add_plugin(plasma_toolbox_desktoptoolbox ${desktoptoolbox_SRCS}) -target_link_libraries(plasma_toolbox_desktoptoolbox ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} kworkspace) +target_link_libraries(plasma_toolbox_desktoptoolbox KDE4::plasma KDE4::kdeui kworkspace) install(TARGETS plasma_toolbox_desktoptoolbox DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) @@ -21,7 +21,7 @@ set(desktoptoolbox_SRCS internaltoolbox.cpp desktoptoolbox.cpp) set(paneltoolbox_SRCS internaltoolbox.cpp paneltoolbox.cpp) kde4_add_plugin(plasma_toolbox_paneltoolbox ${paneltoolbox_SRCS}) -target_link_libraries(plasma_toolbox_paneltoolbox ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) +target_link_libraries(plasma_toolbox_paneltoolbox KDE4::plasma KDE4::kdeui) install(TARGETS plasma_toolbox_paneltoolbox DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/wallpapers/color/CMakeLists.txt b/plasma/wallpapers/color/CMakeLists.txt index d38a07ff..eaff6a66 100644 --- a/plasma/wallpapers/color/CMakeLists.txt +++ b/plasma/wallpapers/color/CMakeLists.txt @@ -9,7 +9,7 @@ set(color_SRCS ) kde4_add_plugin(plasma_wallpaper_color ${color_SRCS}) -target_link_libraries(plasma_wallpaper_color ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(plasma_wallpaper_color KDE4::plasma KDE4::kio) install(TARGETS plasma_wallpaper_color DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-wallpaper-color.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/wallpapers/image/CMakeLists.txt b/plasma/wallpapers/image/CMakeLists.txt index 775a7fe2..aa09b6d2 100644 --- a/plasma/wallpapers/image/CMakeLists.txt +++ b/plasma/wallpapers/image/CMakeLists.txt @@ -13,7 +13,7 @@ set(ksmserver_xml ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface) kde4_add_plugin(plasma_wallpaper_image ${image_SRCS}) -target_link_libraries(plasma_wallpaper_image ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) +target_link_libraries(plasma_wallpaper_image KDE4::plasma KDE4::kio KDE4::kfile) install(TARGETS plasma_wallpaper_image DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-wallpaper-image.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/qguiplatformplugin_kde/CMakeLists.txt b/qguiplatformplugin_kde/CMakeLists.txt index a521d553..ed282a7e 100644 --- a/qguiplatformplugin_kde/CMakeLists.txt +++ b/qguiplatformplugin_kde/CMakeLists.txt @@ -4,7 +4,7 @@ set(kde_SOURCES qguiplatformplugin_kde.cpp) kde4_add_plugin(kde ${kde_SOURCES}) -target_link_libraries(kde ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kde KDE4::kio ${QT_QTGUI_LIBRARY}) install( TARGETS kde LIBRARY diff --git a/solid-actions-kcm/CMakeLists.txt b/solid-actions-kcm/CMakeLists.txt index a637327c..3e51be5f 100644 --- a/solid-actions-kcm/CMakeLists.txt +++ b/solid-actions-kcm/CMakeLists.txt @@ -24,8 +24,8 @@ SET(solid_action_desktop_gen_srcs KDE4_ADD_PLUGIN(kcm_solid_actions ${kcm_solid_actions_srcs}) add_executable(solid-action-desktop-gen ${solid_action_desktop_gen_srcs}) -TARGET_LINK_LIBRARIES(kcm_solid_actions ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ) -TARGET_LINK_LIBRARIES(solid-action-desktop-gen ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ) +TARGET_LINK_LIBRARIES(kcm_solid_actions KDE4::kio KDE4::solid ) +TARGET_LINK_LIBRARIES(solid-action-desktop-gen KDE4::solid KDE4::kio ) ########### install files ############### diff --git a/solid-device-automounter/kcm/CMakeLists.txt b/solid-device-automounter/kcm/CMakeLists.txt index 97a387b1..1c743678 100644 --- a/solid-device-automounter/kcm/CMakeLists.txt +++ b/solid-device-automounter/kcm/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_kcfg_files(kcm_device_automounter_SRCS kde4_add_plugin(kcm_device_automounter ${kcm_device_automounter_SRCS} ${device_automounter_lib_SRCS}) -target_link_libraries(kcm_device_automounter ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries(kcm_device_automounter KDE4::kdeui KDE4::solid) install(TARGETS kcm_device_automounter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/solid-device-automounter/kded/CMakeLists.txt b/solid-device-automounter/kded/CMakeLists.txt index 854e8981..f4e29870 100644 --- a/solid-device-automounter/kded/CMakeLists.txt +++ b/solid-device-automounter/kded/CMakeLists.txt @@ -5,7 +5,7 @@ kde4_add_kcfg_files(kded_device_automounter_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../ kde4_add_plugin(kded_device_automounter ${device_automounter_lib_SRCS} ${kded_device_automounter_SRCS}) -target_link_libraries(kded_device_automounter ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries(kded_device_automounter KDE4::kdeui KDE4::solid) install(TARGETS kded_device_automounter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/solid-hardware/CMakeLists.txt b/solid-hardware/CMakeLists.txt index 402d3c65..b3c12d8f 100644 --- a/solid-hardware/CMakeLists.txt +++ b/solid-hardware/CMakeLists.txt @@ -3,7 +3,7 @@ set(solid-hardware_SRCS solid-hardware.cpp) add_executable(solid-hardware ${solid-hardware_SRCS}) -target_link_libraries(solid-hardware ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries(solid-hardware KDE4::kdecore KDE4::solid) install( TARGETS solid-hardware DESTINATION ${KDE4_BIN_INSTALL_DIR} diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt index 5de6e0cc..56a747e2 100644 --- a/solid-networkstatus/kded/CMakeLists.txt +++ b/solid-networkstatus/kded/CMakeLists.txt @@ -20,7 +20,7 @@ qt4_add_dbus_adaptor(kded_networkstatus_PART_SRCS kde4_add_plugin(kded_networkstatus ${kded_networkstatus_PART_SRCS}) -target_link_libraries(kded_networkstatus ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS}) +target_link_libraries(kded_networkstatus KDE4::kdecore KDE4::kdeui) install(TARGETS kded_networkstatus DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/solid-networkstatus/tests/CMakeLists.txt b/solid-networkstatus/tests/CMakeLists.txt index 42c4e682..8b0f5baf 100644 --- a/solid-networkstatus/tests/CMakeLists.txt +++ b/solid-networkstatus/tests/CMakeLists.txt @@ -4,5 +4,5 @@ qt4_add_dbus_interface(networkingservice_SRCS ../org.kde.Solid.Networking.Servic add_executable(networkingservice ${networkingservice_SRCS}) -target_link_libraries(networkingservice ${KDE4_KIO_LIBS}) +target_link_libraries(networkingservice KDE4::kio) diff --git a/solidautoeject/CMakeLists.txt b/solidautoeject/CMakeLists.txt index e2501b1d..dd0fb0c5 100644 --- a/solidautoeject/CMakeLists.txt +++ b/solidautoeject/CMakeLists.txt @@ -6,7 +6,7 @@ set(kded_solidautoeject_SRCS kde4_add_plugin(kded_solidautoeject ${kded_solidautoeject_SRCS}) -target_link_libraries(kded_solidautoeject ${KDE4_SOLID_LIBS} ${KDE4_KDECORE_LIBS}) +target_link_libraries(kded_solidautoeject KDE4::solid KDE4::kdecore) install(TARGETS kded_solidautoeject DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/soliduiserver/CMakeLists.txt b/soliduiserver/CMakeLists.txt index 07dd99f5..d4598a10 100644 --- a/soliduiserver/CMakeLists.txt +++ b/soliduiserver/CMakeLists.txt @@ -5,7 +5,7 @@ set(soliduiserver_helper_srcs ) add_executable(soliduiserver_helper ${soliduiserver_helper_srcs}) -target_link_libraries(soliduiserver_helper PUBLIC ${KDE4_KDECORE_LIBS}) +target_link_libraries(soliduiserver_helper PUBLIC KDE4::kdecore) ########### next target ############### @@ -20,7 +20,7 @@ set(kded_soliduiserver_SRCS kde4_add_plugin(kded_soliduiserver ${kded_soliduiserver_SRCS}) -target_link_libraries(kded_soliduiserver ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kded_soliduiserver KDE4::solid KDE4::kio) ########### install files ############### diff --git a/statusnotifierwatcher/CMakeLists.txt b/statusnotifierwatcher/CMakeLists.txt index 870450f0..d3920dbe 100644 --- a/statusnotifierwatcher/CMakeLists.txt +++ b/statusnotifierwatcher/CMakeLists.txt @@ -17,7 +17,7 @@ QT4_ADD_DBUS_INTERFACE(kded_statusnotifierwatcher_SRCS ${statusnotifieritem_xml} kde4_add_plugin(kded_statusnotifierwatcher ${kded_statusnotifierwatcher_SRCS}) -target_link_libraries(kded_statusnotifierwatcher ${KDE4_KIO_LIBS} ) +target_link_libraries(kded_statusnotifierwatcher KDE4::kio ) install(TARGETS kded_statusnotifierwatcher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/systemsettings/app/CMakeLists.txt b/systemsettings/app/CMakeLists.txt index 698a156f..02ad5661 100644 --- a/systemsettings/app/CMakeLists.txt +++ b/systemsettings/app/CMakeLists.txt @@ -16,9 +16,9 @@ QT4_ADD_DBUS_ADAPTOR( systemsettings_SRCS org.kde.systemsettings.xml SystemSetti add_executable(systemsettings ${systemsettings_SRCS}) target_link_libraries(systemsettings - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::plasma + KDE4::kio + KDE4::kcmutils systemsettingsview ) diff --git a/systemsettings/core/CMakeLists.txt b/systemsettings/core/CMakeLists.txt index 32068c13..a61f5ad3 100644 --- a/systemsettings/core/CMakeLists.txt +++ b/systemsettings/core/CMakeLists.txt @@ -19,9 +19,9 @@ set(systemsettingsview_LIB_HDRS add_library(systemsettingsview SHARED ${systemsettingsview_LIB_SRCS}) target_link_libraries(systemsettingsview - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kdecore + KDE4::kio + KDE4::kcmutils ) generate_export_header(systemsettingsview) diff --git a/systemsettings/icons/CMakeLists.txt b/systemsettings/icons/CMakeLists.txt index d7fe9107..2dc2ad20 100644 --- a/systemsettings/icons/CMakeLists.txt +++ b/systemsettings/icons/CMakeLists.txt @@ -6,7 +6,7 @@ SET( icon_mode_srcs KDE4_ADD_PLUGIN(icon_mode ${icon_mode_srcs}) -TARGET_LINK_LIBRARIES(icon_mode ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS} systemsettingsview ) +TARGET_LINK_LIBRARIES(icon_mode KDE4::kio KDE4::kcmutils systemsettingsview ) INSTALL( TARGETS icon_mode DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) INSTALL( FILES settings-icon-view.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )