From 472f24878b0f45fd893ff110f3c18148e6bfb1fa Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 17 Jun 2023 18:38:55 +0300 Subject: [PATCH] generic: adjust to kdelibs changes Signed-off-by: Ivailo Monev --- CMakeLists.txt | 11 +++-- KDE4WorkspaceConfig.cmake.in | 10 +++-- KDE4WorkspaceConfigVersion.cmake.in | 23 ++++++++++ KDE4WorkspaceVersion.cmake.in | 7 --- dolphin/src/CMakeLists.txt | 4 +- kate/part/CMakeLists.txt | 2 +- kate/src/app/CMakeLists.txt | 14 +++--- kate/src/interfaces/kate/CMakeLists.txt | 1 - kcminit/CMakeLists.txt | 2 +- kcmshell/CMakeLists.txt | 3 +- kcontrol/access/CMakeLists.txt | 2 +- kcontrol/input/CMakeLists.txt | 10 +++-- kcontrol/randr/CMakeLists.txt | 3 +- kde-menu/CMakeLists.txt | 2 +- kdepasswd/CMakeLists.txt | 2 +- kdesudo/CMakeLists.txt | 2 +- kdialog/CMakeLists.txt | 2 +- kdontchangethehostname/CMakeLists.txt | 7 ++- keditbookmarks/CMakeLists.txt | 5 +-- keditbookmarks/kbookmarkmodel/CMakeLists.txt | 2 +- keditfiletype/CMakeLists.txt | 23 +++++++--- kfile/CMakeLists.txt | 3 +- kfind/CMakeLists.txt | 2 +- kglobalaccel/CMakeLists.txt | 28 ++++++++---- khotkeys/app/CMakeLists.txt | 30 ++++++++----- khotkeys/kcm_hotkeys/CMakeLists.txt | 22 ++++------ khotkeys/libkhotkeysprivate/CMakeLists.txt | 19 ++++++-- kiconfinder/CMakeLists.txt | 5 ++- kinfocenter/CMakeLists.txt | 23 +++++++--- kioclient/CMakeLists.txt | 20 +++++++-- kioexec/CMakeLists.txt | 6 ++- kioslave/trash/CMakeLists.txt | 40 +++++++++++++---- klipper/CMakeLists.txt | 17 +++++-- kmenuedit/CMakeLists.txt | 21 +++++++-- kmimetypefinder/CMakeLists.txt | 5 ++- knetattach/CMakeLists.txt | 11 +++-- knotify/CMakeLists.txt | 5 ++- konsole/src/CMakeLists.txt | 9 +++- kquitapp/CMakeLists.txt | 5 ++- kreadconfig/CMakeLists.txt | 16 ++++--- krunner/CMakeLists.txt | 21 ++++++--- ksmserver/CMakeLists.txt | 44 ++++++++++++------- kstart/CMakeLists.txt | 11 +++-- kstyles/oxygen/config/CMakeLists.txt | 24 ++++++---- kstyles/oxygen/demo/CMakeLists.txt | 9 ++-- ksysguard/gui/CMakeLists.txt | 36 ++++++++++----- ksysguard/ksysguardd/CMakeLists.txt | 3 +- ksystraycmd/CMakeLists.txt | 15 ++++--- ktraderclient/CMakeLists.txt | 6 ++- kuiserver/CMakeLists.txt | 3 +- kwin/CMakeLists.txt | 20 +++++++-- kwin/clients/oxygen/CMakeLists.txt | 10 ++++- kwin/clients/oxygen/config/CMakeLists.txt | 11 +++-- kwin/clients/oxygen/demo/CMakeLists.txt | 5 ++- kwin/libkdecorations/CMakeLists.txt | 18 +++++--- kwin/libkwineffects/CMakeLists.txt | 17 +++++-- libs/konq/CMakeLists.txt | 10 +++-- libs/ksysguard/ksgrd/CMakeLists.txt | 29 +++++++----- libs/ksysguard/lsofui/CMakeLists.txt | 13 ++++-- libs/ksysguard/processcore/CMakeLists.txt | 4 +- libs/ksysguard/processui/CMakeLists.txt | 4 +- libs/ksysguard/signalplotter/CMakeLists.txt | 10 +++-- libs/kworkspace/CMakeLists.txt | 4 +- libs/oxygen/CMakeLists.txt | 23 +++++----- libs/plasmaclock/CMakeLists.txt | 4 +- libs/plasmagenericshell/CMakeLists.txt | 11 ++++- libs/taskmanager/CMakeLists.txt | 5 ++- plasma/applets/kickoff/CMakeLists.txt | 7 ++- plasma/applets/system-monitor/CMakeLists.txt | 2 +- plasma/dataengines/geolocation/CMakeLists.txt | 9 ++-- plasma/dataengines/weather/CMakeLists.txt | 19 ++++++-- .../dataengines/weather/ions/CMakeLists.txt | 4 +- plasma/shells/plasma-desktop/CMakeLists.txt | 25 +++++++---- plasma/shells/plasma-windowed/CMakeLists.txt | 19 ++++++-- solid-actions-kcm/CMakeLists.txt | 24 +++++++--- solid-hardware/CMakeLists.txt | 10 ++--- systemsettings/app/CMakeLists.txt | 27 +++++++++--- systemsettings/core/CMakeLists.txt | 22 +++++++--- 78 files changed, 657 insertions(+), 305 deletions(-) create mode 100644 KDE4WorkspaceConfigVersion.cmake.in delete mode 100644 KDE4WorkspaceVersion.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 20eff2fb..a7b9291d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,7 @@ include(CheckFunctionExists) include(GenerateExportHeader) include(FeatureSummary) -find_package(KDE4 4.23.0 REQUIRED) -include(KDE4Defaults) +find_package(KDELibs4 4.23.0 REQUIRED) # kdelibs requires 0.91 find_package(SharedMimeInfo 0.91) @@ -392,16 +391,16 @@ configure_file( @ONLY ) configure_file( - KDE4WorkspaceVersion.cmake.in - "${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake" + KDE4WorkspaceConfigVersion.cmake.in + "${CMAKE_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake" @ONLY ) install( FILES ${CMAKE_BINARY_DIR}/KDE4WorkspaceConfig.cmake - ${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake - DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules + ${CMAKE_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake + DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/KDE4Workspace ) install( diff --git a/KDE4WorkspaceConfig.cmake.in b/KDE4WorkspaceConfig.cmake.in index 8aecc091..08a2ae51 100644 --- a/KDE4WorkspaceConfig.cmake.in +++ b/KDE4WorkspaceConfig.cmake.in @@ -1,18 +1,20 @@ # KDE4WorkspaceConfig.cmake is generated by CMake from kde-workspace/KDE4WorkspaceConfig.cmake.in +find_package(KDELibs4 REQUIRED QUIET) + # the exports file exports set(KDE4WORKSPACE_TARGET_PREFIX @KDE4WORKSPACE_TARGET_PREFIX@) # Make sure to load the exported targets only once # For the rest of this script it doesn't matter that much if(NOT TARGET @KDE4WORKSPACE_TARGET_PREFIX@plasmaclock) - get_filename_component(_currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH) - include("${_currentDir}/KDE4WorkspaceLibraryTargets.cmake") + get_filename_component(_currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH) + include("${_currentDir}/KDE4WorkspaceLibraryTargets.cmake") endif(NOT TARGET @KDE4WORKSPACE_TARGET_PREFIX@plasmaclock) macro(_KDE4WORKSPACE_Set_Lib_Vars _prefix _lib) - set(KDE4WORKSPACE_${_prefix}_LIBRARY ${KDE4WORKSPACE_TARGET_PREFIX}${_lib}) - set(KDE4WORKSPACE_${_prefix}_LIBS ${KDE4WORKSPACE_TARGET_PREFIX}${_lib}) + set(KDE4WORKSPACE_${_prefix}_LIBRARY ${KDE4WORKSPACE_TARGET_PREFIX}${_lib}) + set(KDE4WORKSPACE_${_prefix}_LIBS ${KDE4WORKSPACE_TARGET_PREFIX}${_lib}) endmacro(_KDE4WORKSPACE_Set_Lib_Vars) diff --git a/KDE4WorkspaceConfigVersion.cmake.in b/KDE4WorkspaceConfigVersion.cmake.in new file mode 100644 index 00000000..746279a6 --- /dev/null +++ b/KDE4WorkspaceConfigVersion.cmake.in @@ -0,0 +1,23 @@ +# KDE4WorkspaceVersion.cmake is generated by CMake from kde-workspace/KDE4WorkspaceVersion.cmake.in + +# Do we have a version number for kdebase/workspace ? Alex +set(KDE4WORKSPACE_VERSION_MAJOR @KDE_VERSION_MAJOR@) +set(KDE4WORKSPACE_VERSION_MINOR @KDE_VERSION_MINOR@) +set(KDE4WORKSPACE_VERSION_PATCH @KDE_VERSION_RELEASE@) +set(KDE4WORKSPACE_VERSION @KDE_VERSION@) + +# Compatibility with find_package() query and version requirement +set(PACKAGE_VERSION "${KDE4WORKSPACE_VERSION}") +set(PACKAGE_VERSION_MAJOR "${KDE4WORKSPACE_VERSION_MAJOR}") +set(PACKAGE_VERSION_MINOR "${KDE4WORKSPACE_VERSION_MINOR}") +set(PACKAGE_VERSION_PATCH "${KDE4WORKSPACE_VERSION_PATCH}") + +# Check whether the requested PACKAGE_FIND_VERSION is compatible +if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() diff --git a/KDE4WorkspaceVersion.cmake.in b/KDE4WorkspaceVersion.cmake.in deleted file mode 100644 index 836556f8..00000000 --- a/KDE4WorkspaceVersion.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ -# KDE4WorkspaceVersion.cmake is generated by CMake from kde-workspace/KDE4WorkspaceVersion.cmake.in - -# Do we have a version number for kdebase/workspace ? Alex -set(KDE4WORKSPACE_VERSION_MAJOR @KDE_VERSION_MAJOR@) -set(KDE4WORKSPACE_VERSION_MINOR @KDE_VERSION_MINOR@) -set(KDE4WORKSPACE_VERSION_PATCH @KDE_VERSION_RELEASE@) -set(KDE4WORKSPACE_VERSION "${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH}") diff --git a/dolphin/src/CMakeLists.txt b/dolphin/src/CMakeLists.txt index 6cc32f94..b0afb100 100644 --- a/dolphin/src/CMakeLists.txt +++ b/dolphin/src/CMakeLists.txt @@ -93,7 +93,7 @@ generate_export_header(dolphinprivate) install( TARGETS dolphinprivate - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) ########################################## @@ -213,7 +213,7 @@ target_link_libraries(dolphin install( TARGETS dolphin - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) ########################################## diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index e3c7c157..568d247b 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -171,7 +171,7 @@ generate_export_header(katepartinterfaces) # install kate part interfaces install( TARGETS katepartinterfaces - EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) # kate part itself just is interfaces + the factory diff --git a/kate/src/app/CMakeLists.txt b/kate/src/app/CMakeLists.txt index bcf07f4f..69ec7646 100644 --- a/kate/src/app/CMakeLists.txt +++ b/kate/src/app/CMakeLists.txt @@ -26,8 +26,6 @@ set(kateinterfaces_LIB_SRCS katequickopen.cpp ) - - add_library(kateinterfaces SHARED ${kateinterfaces_LIB_SRCS}) target_link_libraries(kateinterfaces PUBLIC @@ -54,14 +52,16 @@ target_link_libraries(kate generate_export_header(kateinterfaces BASE_NAME kate) install( - TARGETS - kateinterfaces - kate - ${INSTALL_TARGETS_DEFAULT_ARGS} + TARGETS kateinterfaces + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) + +install( + TARGETS kate + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kate_export.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} - COMPONENT Devel ) diff --git a/kate/src/interfaces/kate/CMakeLists.txt b/kate/src/interfaces/kate/CMakeLists.txt index b19d4e94..a53807d6 100644 --- a/kate/src/interfaces/kate/CMakeLists.txt +++ b/kate/src/interfaces/kate/CMakeLists.txt @@ -8,5 +8,4 @@ install( pluginconfigpageinterface.h pluginmanager.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kate - COMPONENT Devel ) diff --git a/kcminit/CMakeLists.txt b/kcminit/CMakeLists.txt index d19f0820..25dd5b2b 100644 --- a/kcminit/CMakeLists.txt +++ b/kcminit/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(kcminit install( TARGETS kcminit - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) # write a cmake script file which creates the symlink diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt index e8488fa5..2de63b3c 100644 --- a/kcmshell/CMakeLists.txt +++ b/kcmshell/CMakeLists.txt @@ -9,5 +9,6 @@ target_link_libraries(kcmshell4 install( TARGETS kcmshell4 - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} + COMPONENT RUNTIME ) diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt index a5662475..89122314 100644 --- a/kcontrol/access/CMakeLists.txt +++ b/kcontrol/access/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(kaccess install( TARGETS kaccess - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) ########### install files ############### diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index 2b95d2ac..056655cf 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -8,11 +8,10 @@ configure_file ( ${CMAKE_CURRENT_BINARY_DIR}/config-kcontrol-input.h ) -include_directories( ${KDE4_INCLUDES} ) - +include_directories(${KDE4_INCLUDES}) if (LIBUSB_FOUND) - include_directories( ${LIBUSB_INCLUDES} ) + include_directories(${LIBUSB_INCLUDES}) endif (LIBUSB_FOUND) @@ -51,7 +50,10 @@ if (X11_Xcursor_FOUND) target_link_libraries(kapplymousetheme ${X11_Xcursor_LIB}) endif (X11_Xcursor_FOUND) -install(TARGETS kapplymousetheme ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kapplymousetheme + DESTINATION ${KDE_BIN_INSTALL_DIR} +) ########### next target ############### diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 78e5dd59..811d0860 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -59,7 +59,8 @@ target_link_libraries(krandrtray ) install( - TARGETS krandrtray ${INSTALL_TARGETS_DEFAULT_ARGS} + TARGETS krandrtray + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) ########### next target ############### diff --git a/kde-menu/CMakeLists.txt b/kde-menu/CMakeLists.txt index f0db6f44..d18357ff 100644 --- a/kde-menu/CMakeLists.txt +++ b/kde-menu/CMakeLists.txt @@ -4,5 +4,5 @@ target_link_libraries(kde4-menu ${KDE4_KDECORE_LIBS}) install( TARGETS kde4-menu - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) diff --git a/kdepasswd/CMakeLists.txt b/kdepasswd/CMakeLists.txt index 44d34ef6..ed062767 100644 --- a/kdepasswd/CMakeLists.txt +++ b/kdepasswd/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(kdepasswd install( TARGETS kdepasswd - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) install( PROGRAMS kdepasswd.desktop diff --git a/kdesudo/CMakeLists.txt b/kdesudo/CMakeLists.txt index e80726d9..a3865723 100644 --- a/kdesudo/CMakeLists.txt +++ b/kdesudo/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(kdesudo install( TARGETS kdesudo - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) diff --git a/kdialog/CMakeLists.txt b/kdialog/CMakeLists.txt index 275fb1d5..95b5ebbb 100644 --- a/kdialog/CMakeLists.txt +++ b/kdialog/CMakeLists.txt @@ -27,7 +27,7 @@ endif() install( TARGETS kdialog - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) install( FILES org.kde.kdialog.ProgressDialog.xml diff --git a/kdontchangethehostname/CMakeLists.txt b/kdontchangethehostname/CMakeLists.txt index 27841e92..c1849222 100644 --- a/kdontchangethehostname/CMakeLists.txt +++ b/kdontchangethehostname/CMakeLists.txt @@ -1,5 +1,10 @@ set(kdontchangethehostname_SRCS khostname.cpp ) + add_executable(kdontchangethehostname ${kdontchangethehostname_SRCS}) target_link_libraries(kdontchangethehostname ${KDE4_KDECORE_LIBS}) -install(TARGETS kdontchangethehostname DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) + +install( + TARGETS kdontchangethehostname + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} +) diff --git a/keditbookmarks/CMakeLists.txt b/keditbookmarks/CMakeLists.txt index 1eb307ea..cbe307db 100644 --- a/keditbookmarks/CMakeLists.txt +++ b/keditbookmarks/CMakeLists.txt @@ -10,10 +10,9 @@ target_link_libraries(kbookmarkmerger ${KDE4_KIO_LIBS}) install( TARGETS kbookmarkmerger - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) - ########### next target ############### set(keditbookmarks_SRCS @@ -58,7 +57,7 @@ target_link_libraries(keditbookmarks install( TARGETS keditbookmarks - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) ########### install files ############### diff --git a/keditbookmarks/kbookmarkmodel/CMakeLists.txt b/keditbookmarks/kbookmarkmodel/CMakeLists.txt index 86a55d15..d2975599 100644 --- a/keditbookmarks/kbookmarkmodel/CMakeLists.txt +++ b/keditbookmarks/kbookmarkmodel/CMakeLists.txt @@ -25,5 +25,5 @@ generate_export_header(kbookmarkmodel_private BASE_NAME KBOOKMARKMODEL) install( TARGETS kbookmarkmodel_private - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) diff --git a/keditfiletype/CMakeLists.txt b/keditfiletype/CMakeLists.txt index 31d35ba4..979feebf 100644 --- a/keditfiletype/CMakeLists.txt +++ b/keditfiletype/CMakeLists.txt @@ -21,7 +21,10 @@ kde4_add_plugin(kcm_filetypes ${kcm_filetypes_SRCS}) target_link_libraries(kcm_filetypes ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_filetypes DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( + TARGETS kcm_filetypes + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) ########### next target ############### @@ -29,13 +32,19 @@ set(keditfiletype_SRCS keditfiletype.cpp ${libfiletypes_SRCS}) add_executable(keditfiletype ${keditfiletype_SRCS}) -target_link_libraries(keditfiletype ${KDE4_KIO_LIBS}) -if (Q_WS_X11) - target_link_libraries(keditfiletype ${X11_X11_LIB}) -endif (Q_WS_X11) +target_link_libraries(keditfiletype + ${KDE4_KIO_LIBS} + ${X11_X11_LIB} +) -install(TARGETS keditfiletype ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS keditfiletype + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### install files ############### -install( FILES filetypes.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( + FILES filetypes.desktop + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} +) diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt index 72089127..d26d5cd5 100644 --- a/kfile/CMakeLists.txt +++ b/kfile/CMakeLists.txt @@ -5,5 +5,6 @@ add_executable(kfile4 ${kfile_SRCS}) target_link_libraries(kfile4 ${KDE4_KIO_LIBS}) install( - TARGETS kfile4 ${INSTALL_TARGETS_DEFAULT_ARGS} + TARGETS kfile4 + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) diff --git a/kfind/CMakeLists.txt b/kfind/CMakeLists.txt index 7a5810fb..9b0af570 100644 --- a/kfind/CMakeLists.txt +++ b/kfind/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(kfind install( TARGETS kfind - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) ########### install files ############### diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt index e69014a8..8c6e6129 100644 --- a/kglobalaccel/CMakeLists.txt +++ b/kglobalaccel/CMakeLists.txt @@ -17,21 +17,31 @@ set(kglobalaccel_SRCS globalshortcut.cpp globalshortcutsregistry.cpp globalshortcutcontext.cpp + kglobalaccel_x11.cpp ) -if(Q_WS_X11) - set(kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_x11.cpp) -endif() - add_executable(kglobalaccel ${kglobalaccel_SRCS}) -target_link_libraries(kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kglobalaccel + ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} + ${X11_LIBRARIES} +) # Install application and configuration -install( TARGETS kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} ) -# install( FILES kglobalaccel.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) -install( FILES kglobalaccel.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install( + TARGETS kglobalaccel + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) +# install(FILES kglobalaccel.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install( + FILES kglobalaccel.desktop + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} +) # KNotify configuration -install( FILES kglobalaccel.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kglobalaccel) +install( + FILES kglobalaccel.notifyrc + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kglobalaccel +) kde4_add_dbus_service(org.kde.kglobalaccel.service.in) diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt index d882909d..8cca19cc 100644 --- a/khotkeys/app/CMakeLists.txt +++ b/khotkeys/app/CMakeLists.txt @@ -7,21 +7,29 @@ set(kded_khotkeys_PART_SRCS qt4_generate_dbus_interface(kded.h org.kde.khotkeys.xml ) kde4_add_plugin(kded_khotkeys ${kded_khotkeys_PART_SRCS}) -target_link_libraries(kded_khotkeys khotkeysprivate kworkspace ${KDE4_KDEUI_LIBS}) - -# I'm not sure if this is needed anymore. Check it -if(X11_XTest_FOUND) - target_link_libraries(kded_khotkeys ${X11_XTest_LIB}) -endif(X11_XTest_FOUND) - +target_link_libraries(kded_khotkeys + ${KDE4_KDEUI_LIBS} + # I'm not sure if this is needed anymore. Check it + ${X11_XTest_LIB} + khotkeysprivate + kworkspace +) ########### install files ############### -install(TARGETS kded_khotkeys DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install( + TARGETS kded_khotkeys + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) -install(FILES khotkeys.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) +install( + FILES khotkeys.desktop + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded +) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.khotkeys.xml - DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.khotkeys.xml + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} +) diff --git a/khotkeys/kcm_hotkeys/CMakeLists.txt b/khotkeys/kcm_hotkeys/CMakeLists.txt index c8ba08a9..b7d5bdd9 100644 --- a/khotkeys/kcm_hotkeys/CMakeLists.txt +++ b/khotkeys/kcm_hotkeys/CMakeLists.txt @@ -60,35 +60,31 @@ set( # ACTION_DATA WIDGETS hotkeys_widget_base.ui - ) +) qt4_add_dbus_interface( kcm_hotkeys_PART_SRCS ${CMAKE_CURRENT_BINARY_DIR}/../app/org.kde.khotkeys.xml - khotkeys_interface) + khotkeys_interface +) - -kde4_add_plugin( - kcm_hotkeys - ${kcm_hotkeys_PART_SRCS} - ) +kde4_add_plugin(kcm_hotkeys ${kcm_hotkeys_PART_SRCS}) add_dependencies(kcm_hotkeys kded_khotkeys) -target_link_libraries( - kcm_hotkeys - khotkeysprivate +target_link_libraries(kcm_hotkeys ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} - ) + khotkeysprivate +) install( TARGETS kcm_hotkeys DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} - ) +) install( FILES khotkeys.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} - ) +) diff --git a/khotkeys/libkhotkeysprivate/CMakeLists.txt b/khotkeys/libkhotkeysprivate/CMakeLists.txt index 8a715939..37a77052 100644 --- a/khotkeys/libkhotkeysprivate/CMakeLists.txt +++ b/khotkeys/libkhotkeysprivate/CMakeLists.txt @@ -62,10 +62,21 @@ set(khotkeysprivate_SRCS ) add_library(khotkeysprivate SHARED ${khotkeysprivate_SRCS}) -target_link_libraries(khotkeysprivate kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(khotkeysprivate + ${KDE4_KIO_LIBS} + ${X11_LIBRARIES} + kworkspace +) if(X11_XTest_FOUND) - target_link_libraries(khotkeysprivate ${X11_XTest_LIB}) + target_link_libraries(khotkeysprivate ${X11_XTest_LIB}) endif(X11_XTest_FOUND) -set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) -install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +set_target_properties(khotkeysprivate PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) +install( + TARGETS khotkeysprivate + DESTINATION ${KDE4_LIB_INSTALL_DIR} + LIBRARY NAMELINK_SKIP +) diff --git a/kiconfinder/CMakeLists.txt b/kiconfinder/CMakeLists.txt index edabd20f..77048709 100644 --- a/kiconfinder/CMakeLists.txt +++ b/kiconfinder/CMakeLists.txt @@ -2,4 +2,7 @@ add_executable(kiconfinder kiconfinder.cpp) target_link_libraries(kiconfinder ${KDE4_KDEUI_LIBS}) -install(TARGETS kiconfinder ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( + TARGETS kiconfinder + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kinfocenter/CMakeLists.txt b/kinfocenter/CMakeLists.txt index 5ddc9f65..507a08a8 100644 --- a/kinfocenter/CMakeLists.txt +++ b/kinfocenter/CMakeLists.txt @@ -46,12 +46,23 @@ set( kinfocenter_SRCS ToolTips/tooltipmanager.cpp ) -add_executable( kinfocenter ${kinfocenter_SRCS} ) +add_executable(kinfocenter ${kinfocenter_SRCS} ) -target_link_libraries( kinfocenter ${KDE4_KFILE_LIBS} ${KDE4_KCMUTILS_LIBS} ) +target_link_libraries(kinfocenter + ${KDE4_KFILE_LIBS} + ${KDE4_KCMUTILS_LIBS} +) ##install - -install( TARGETS kinfocenter ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( PROGRAMS kinfocenter.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -INSTALL( FILES kinfocenterui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kinfocenter ) +install( + TARGETS kinfocenter + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) +install( + PROGRAMS kinfocenter.desktop + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} +) +INSTALL( + FILES kinfocenterui.rc + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kinfocenter +) diff --git a/kioclient/CMakeLists.txt b/kioclient/CMakeLists.txt index 515e5b6c..098a876d 100644 --- a/kioclient/CMakeLists.txt +++ b/kioclient/CMakeLists.txt @@ -4,7 +4,10 @@ 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}) -install(TARGETS kioclient ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kioclient + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ################ @@ -12,7 +15,10 @@ 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}) -install(TARGETS kde-open ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kde-open + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ################ @@ -20,7 +26,10 @@ 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}) -install(TARGETS kde-cp ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kde-cp + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ################ @@ -28,5 +37,8 @@ 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}) -install(TARGETS kde-mv ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kde-mv + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kioexec/CMakeLists.txt b/kioexec/CMakeLists.txt index 79d24ac5..2deaac69 100644 --- a/kioexec/CMakeLists.txt +++ b/kioexec/CMakeLists.txt @@ -4,5 +4,7 @@ add_executable(kioexec ${kioexec_SRCS}) target_link_libraries(kioexec ${KDE4_KIO_LIBS}) -install(TARGETS kioexec DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) - +install( + TARGETS kioexec + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} +) diff --git a/kioslave/trash/CMakeLists.txt b/kioslave/trash/CMakeLists.txt index 80e4e586..7775ff01 100644 --- a/kioslave/trash/CMakeLists.txt +++ b/kioslave/trash/CMakeLists.txt @@ -16,29 +16,51 @@ 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}) +target_link_libraries(kio_trash + ${KDE4_KIO_LIBS} + ${KDE4_SOLID_LIBS} +) -install(TARGETS kio_trash DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) +install( + TARGETS kio_trash + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} +) ########### next target ############### -set(ktrash_SRCS ktrash.cpp ) +set(ktrash_SRCS ktrash.cpp) add_executable(ktrash ${ktrash_SRCS}) -target_link_libraries(ktrash ${KDE4_KIO_LIBS} ) +target_link_libraries(ktrash ${KDE4_KIO_LIBS}) -install(TARGETS ktrash ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS ktrash + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### next target ############### 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}) +target_link_libraries(kcm_trash + ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} + ${KDE4_SOLID_LIBS} +) -install(TARGETS kcm_trash DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install( + TARGETS kcm_trash + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) ########### install files ############### -install( FILES trash.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -install( FILES kcmtrash.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( + FILES trash.protocol + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} +) +install( + FILES kcmtrash.desktop + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} +) diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index 82179a85..04ce5580 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -30,10 +30,19 @@ target_link_libraries(klipper ${X11_LIBRARIES} ) if (X11_Xfixes_FOUND) - target_link_libraries(klipper ${X11_Xfixes_LIB}) + target_link_libraries(klipper ${X11_Xfixes_LIB}) endif (X11_Xfixes_FOUND) -install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS klipper + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) -install(PROGRAMS klipper.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -install(PROGRAMS klipper.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install( + PROGRAMS klipper.desktop + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} +) +install( + PROGRAMS klipper.desktop + DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR} +) diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt index 6ea230ff..2e75f4a3 100644 --- a/kmenuedit/CMakeLists.txt +++ b/kmenuedit/CMakeLists.txt @@ -28,14 +28,27 @@ set(kmenuedit_SRCS main.cpp ${kmenueditcommon_STAT_SRCS}) add_executable(kmenuedit ${kmenuedit_SRCS}) -target_link_libraries(kmenuedit ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY}) +target_link_libraries(kmenuedit + ${KDE4_KIO_LIBS} + ${QT_QTXML_LIBRARY} + ${QT_QTDBUS_LIBRARY} +) -install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kmenuedit + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### install files ############### -install(PROGRAMS kmenuedit.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -install(FILES kmenueditui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmenuedit) +install( + PROGRAMS kmenuedit.desktop + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} +) +install( + FILES kmenueditui.rc + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmenuedit +) add_dependencies(kmenuedit kded_khotkeys) diff --git a/kmimetypefinder/CMakeLists.txt b/kmimetypefinder/CMakeLists.txt index b15a0e3e..58e3985c 100644 --- a/kmimetypefinder/CMakeLists.txt +++ b/kmimetypefinder/CMakeLists.txt @@ -2,4 +2,7 @@ add_executable(kmimetypefinder kmimetypefinder.cpp) target_link_libraries(kmimetypefinder ${KDE4_KDECORE_LIBS}) -install(TARGETS kmimetypefinder ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( + TARGETS kmimetypefinder + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/knetattach/CMakeLists.txt b/knetattach/CMakeLists.txt index 8272f375..ef9ecf7b 100644 --- a/knetattach/CMakeLists.txt +++ b/knetattach/CMakeLists.txt @@ -4,12 +4,17 @@ add_executable(knetattach ${knetattach_SRCS}) target_link_libraries(knetattach ${KDE4_KIO_LIBS}) -install(TARGETS knetattach DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) - +install( + TARGETS knetattach + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} +) ########### install files ############### -install(PROGRAMS knetattach.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install( + PROGRAMS knetattach.desktop + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} +) kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt index 0b07cd5b..bfed5742 100644 --- a/knotify/CMakeLists.txt +++ b/knotify/CMakeLists.txt @@ -26,7 +26,10 @@ target_link_libraries(knotify4 ${KDE4_KMEDIAPLAYER_LIBS} ) -install(TARGETS knotify4 ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS knotify4 + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### install files ############### diff --git a/konsole/src/CMakeLists.txt b/konsole/src/CMakeLists.txt index fcf7ee2b..b6923687 100644 --- a/konsole/src/CMakeLists.txt +++ b/konsole/src/CMakeLists.txt @@ -161,8 +161,13 @@ target_link_libraries(konsole PRIVATE konsoleprivate) generate_export_header(konsoleprivate) install( - TARGETS konsole konsoleprivate - ${INSTALL_TARGETS_DEFAULT_ARGS} + TARGETS konsole + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) + +install( + TARGETS konsoleprivate + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) ### Embedded Konsole KPart diff --git a/kquitapp/CMakeLists.txt b/kquitapp/CMakeLists.txt index 9e1489c8..635550c6 100644 --- a/kquitapp/CMakeLists.txt +++ b/kquitapp/CMakeLists.txt @@ -3,4 +3,7 @@ set(kquitapp_SRCS kquitapp.cpp) add_executable(kquitapp ${kquitapp_SRCS}) target_link_libraries(kquitapp ${KDE4_KDECORE_LIBS}) -install(TARGETS kquitapp ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kquitapp + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kreadconfig/CMakeLists.txt b/kreadconfig/CMakeLists.txt index 47dfbee9..8ef49552 100644 --- a/kreadconfig/CMakeLists.txt +++ b/kreadconfig/CMakeLists.txt @@ -4,17 +4,21 @@ set(kreadconfig_SRCS kreadconfig.cpp ) add_executable(kreadconfig ${kreadconfig_SRCS}) -target_link_libraries(kreadconfig ${KDE4_KDECORE_LIBS} ) - -install(TARGETS kreadconfig ${INSTALL_TARGETS_DEFAULT_ARGS}) +target_link_libraries(kreadconfig ${KDE4_KDECORE_LIBS}) +install( + TARGETS kreadconfig + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### next target ############### set(kwriteconfig_SRCS kwriteconfig.cpp ) add_executable(kwriteconfig ${kwriteconfig_SRCS}) +target_link_libraries(kwriteconfig ${KDE4_KDECORE_LIBS}) -target_link_libraries(kwriteconfig ${KDE4_KDECORE_LIBS} ) - -install(TARGETS kwriteconfig ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kwriteconfig + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt index 2d9ccf20..e8297898 100644 --- a/krunner/CMakeLists.txt +++ b/krunner/CMakeLists.txt @@ -55,21 +55,30 @@ set(krunner_SRCS add_executable(krunner ${krunner_SRCS}) target_link_libraries(krunner - kworkspace - plasmagenericshell - processui ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} ${X11_X11_LIB} + kworkspace + plasmagenericshell + processui ) if(X11_Xcursor_FOUND) target_link_libraries(krunner ${X11_Xcursor_LIB}) endif() -install(TARGETS krunner ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( + TARGETS krunner + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) -install(FILES krunner.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) -install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) +install( + FILES krunner.desktop + DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR} +) +install( + FILES ${krunner_dbusAppXML} + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} +) diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 2a8c542a..4c9377bd 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -21,13 +21,13 @@ configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmse ########### next target ############### set(ksmserver_SRCS - main.cpp - server.cpp - shutdowndlg.cpp - legacy.cpp - startup.cpp - shutdown.cpp - client.cpp + main.cpp + server.cpp + shutdowndlg.cpp + legacy.cpp + startup.cpp + shutdown.cpp + client.cpp ) set(kcminit_adaptor ${CMAKE_SOURCE_DIR}/kcminit/main.h) @@ -44,9 +44,9 @@ qt4_add_dbus_interface( ksmserver_SRCS ${kcminit_xml} kcminit_interface ) # set(klauncher_xml ${KDE4_DBUS_INTERFACES_INSTALL_DIR}/org.kde.KLauncher.xml) # qt4_add_dbus_interface( ksmserver_SRCS ${klauncher_xml} klauncher_interface ) -qt4_add_dbus_adaptor( ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) +qt4_add_dbus_adaptor(ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMServer) -add_executable( ksmserver ${ksmserver_SRCS}) +add_executable(ksmserver ${ksmserver_SRCS}) target_link_libraries(ksmserver ${KDE4_PLASMA_LIBS} @@ -59,20 +59,32 @@ target_link_libraries(ksmserver kworkspace ) -install(TARGETS ksmserver ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS ksmserver + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### next target ############### set(kcheckrunning_SRCS - kcheckrunning.cpp) - -add_executable( kcheckrunning ${kcheckrunning_SRCS}) + kcheckrunning.cpp +) +add_executable(kcheckrunning ${kcheckrunning_SRCS}) target_link_libraries(kcheckrunning ${X11_LIBRARIES}) -install(TARGETS kcheckrunning ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kcheckrunning + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### install files ############### -install( FILES org.kde.KSMServerInterface.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) -install( DIRECTORY themes/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksmserver/themes ) +install( + FILES org.kde.KSMServerInterface.xml + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} +) +install( + DIRECTORY themes/ + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksmserver/themes +) diff --git a/kstart/CMakeLists.txt b/kstart/CMakeLists.txt index 6033cc84..e27a7a1e 100644 --- a/kstart/CMakeLists.txt +++ b/kstart/CMakeLists.txt @@ -1,10 +1,15 @@ set(kstart_SRCS kstart.cpp) - add_executable(kstart ${kstart_SRCS}) -target_link_libraries(kstart ${KDE4_KDEUI_LIBS} ${X11_X11_LIB}) +target_link_libraries(kstart + ${KDE4_KDEUI_LIBS} + ${X11_X11_LIB} +) -install(TARGETS kstart ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kstart + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kstyles/oxygen/config/CMakeLists.txt b/kstyles/oxygen/config/CMakeLists.txt index f965dca8..13fa141c 100644 --- a/kstyles/oxygen/config/CMakeLists.txt +++ b/kstyles/oxygen/config/CMakeLists.txt @@ -1,4 +1,7 @@ -include_directories( ${KDE4_KDEUI_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/oxygen) +include_directories( + ${KDE4_KDEUI_INCLUDES} + ${CMAKE_SOURCE_DIR}/libs/oxygen +) ########### next target ############### set(kstyle_oxygen_config_PART_SRCS @@ -10,21 +13,23 @@ 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 +target_link_libraries(kstyle_oxygen_config ${KDE4_KDEUI_LIBS} - oxygenstyleconfig ) + oxygenstyleconfig +) -install(TARGETS kstyle_oxygen_config DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install( + TARGETS kstyle_oxygen_config + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) ########### next target ############### -set( oxygen_settings_SOURCES +set(oxygen_settings_SOURCES oxygenconfigdialog.cpp main.cpp ) add_executable(oxygen-settings ${oxygen_settings_SOURCES}) - target_link_libraries(oxygen-settings ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} @@ -32,7 +37,10 @@ target_link_libraries(oxygen-settings ) ########### install files ############### -install(TARGETS oxygen-settings ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS oxygen-settings + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kstyles/oxygen/demo/CMakeLists.txt b/kstyles/oxygen/demo/CMakeLists.txt index abfa13b5..1d108786 100644 --- a/kstyles/oxygen/demo/CMakeLists.txt +++ b/kstyles/oxygen/demo/CMakeLists.txt @@ -25,11 +25,14 @@ set(oxygen_demo_SOURCES ) add_executable(oxygen-demo ${oxygen_demo_SOURCES}) - target_link_libraries(oxygen-demo ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY}) + ${QT_QTGUI_LIBRARY} +) ########### install files ############### -install(TARGETS oxygen-demo ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS oxygen-demo + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt index 1d69ad00..99bcdb95 100644 --- a/ksysguard/gui/CMakeLists.txt +++ b/ksysguard/gui/CMakeLists.txt @@ -8,7 +8,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/libs ${CMAKE_SOURCE_DIR}/libs/ksysguard ${CMAKE_SOURCE_DIR}/libs/ksysguard/signalplotter - ${CMAKE_SOURCE_DIR}/libs/ksysguard/processcore ) + ${CMAKE_SOURCE_DIR}/libs/ksysguard/processcore +) ########### next target ############### @@ -48,19 +49,34 @@ set(ksysguard_SRCS ${libsensordisplays_SRCS} Workspace.cpp HostConnector.cpp StyleEngine.cpp - ksysguard.cpp ) - - + ksysguard.cpp +) add_executable(ksysguard ${ksysguard_SRCS}) +target_link_libraries(ksysguard + ${KDE4_KIO_LIBS} + processui ksignalplotter + ksgrd +) -target_link_libraries(ksysguard processui ksignalplotter ${KDE4_KIO_LIBS} ksgrd) - -install(TARGETS ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS ksysguard + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### install files ############### -install( PROGRAMS ksysguard.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -install( FILES ProcessTable.sgrd SystemLoad2.sgrd DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksysguard ) -install( FILES ksysguardui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksysguard ) +install( + PROGRAMS ksysguard.desktop + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} +) +install( + FILES + ProcessTable.sgrd SystemLoad2.sgrd + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksysguard +) +install( + FILES ksysguardui.rc + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksysguard +) diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index 43a2f03a..79d06ddd 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -49,5 +49,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "DragonFly") endif() install( - TARGETS ksysguardd ${INSTALL_TARGETS_DEFAULT_ARGS} + TARGETS ksysguardd + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) diff --git a/ksystraycmd/CMakeLists.txt b/ksystraycmd/CMakeLists.txt index b294f4fe..a87afe0a 100644 --- a/ksystraycmd/CMakeLists.txt +++ b/ksystraycmd/CMakeLists.txt @@ -1,11 +1,12 @@ set(ksystraycmd_SRCS ksystraycmd.cpp main.cpp ) - add_executable(ksystraycmd ${ksystraycmd_SRCS}) +target_link_libraries(ksystraycmd + ${KDE4_KDEUI_LIBS} + ${X11_X11_LIB} +) -target_link_libraries(ksystraycmd ${KDE4_KDEUI_LIBS}) -if (Q_WS_X11) - target_link_libraries(ksystraycmd ${X11_X11_LIB}) -endif (Q_WS_X11) - -install(TARGETS ksystraycmd ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS ksystraycmd + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/ktraderclient/CMakeLists.txt b/ktraderclient/CMakeLists.txt index 80a67124..caca1591 100644 --- a/ktraderclient/CMakeLists.txt +++ b/ktraderclient/CMakeLists.txt @@ -1,5 +1,7 @@ add_executable(ktraderclient ktraderclient.cpp) - target_link_libraries(ktraderclient ${KDE4_KDECORE_LIBS}) -install(TARGETS ktraderclient ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( + TARGETS ktraderclient + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt index bbffd6d9..7982f44a 100644 --- a/kuiserver/CMakeLists.txt +++ b/kuiserver/CMakeLists.txt @@ -44,7 +44,8 @@ add_executable(kuiserver ${kuiserver_SRCS}) target_link_libraries(kuiserver ${KDE4_KIO_LIBS}) install( - TARGETS kuiserver ${INSTALL_TARGETS_DEFAULT_ARGS} + TARGETS kuiserver + DESTINATION ${KDE4_BIN_INSTALL_DIR} ) install( diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt index 27177f1c..358324fb 100644 --- a/kwin/CMakeLists.txt +++ b/kwin/CMakeLists.txt @@ -195,13 +195,25 @@ if(X11_xf86vmode_FOUND) target_link_libraries(kwin ${X11_Xxf86vm_LIB}) endif() -install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kwin + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### install files ############### -install(FILES kwin.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) -install(FILES kwin.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin) -install(FILES org.kde.KWin.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) +install( + FILES kwin.kcfg + DESTINATION ${KDE4_KCFG_INSTALL_DIR} +) +install( + FILES kwin.notifyrc + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin +) +install( + FILES org.kde.KWin.xml + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} +) kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kwin/clients/oxygen/CMakeLists.txt b/kwin/clients/oxygen/CMakeLists.txt index 2c1e6dff..e23c6043 100644 --- a/kwin/clients/oxygen/CMakeLists.txt +++ b/kwin/clients/oxygen/CMakeLists.txt @@ -27,7 +27,13 @@ target_link_libraries(kwin3_oxygen oxygenstyle ) -install(TARGETS kwin3_oxygen DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install( + TARGETS kwin3_oxygen + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) ########### install files ############### -install(FILES oxygenclient.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin) +install( + FILES oxygenclient.desktop + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin +) diff --git a/kwin/clients/oxygen/config/CMakeLists.txt b/kwin/clients/oxygen/config/CMakeLists.txt index 711aa7e5..d588621b 100644 --- a/kwin/clients/oxygen/config/CMakeLists.txt +++ b/kwin/clients/oxygen/config/CMakeLists.txt @@ -1,4 +1,6 @@ -include_directories( ${CMAKE_SOURCE_DIR}/libs/oxygen) +include_directories( + ${CMAKE_SOURCE_DIR}/libs/oxygen +) set(kwin_oxygen_config_PART_SRCS oxygenconfig.cpp @@ -10,7 +12,7 @@ set(kwin_oxygen_config_PART_SRCS ../oxygenexceptionlist.cpp ) -kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc ) +kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc) kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS}) @@ -22,4 +24,7 @@ target_link_libraries(kwin_oxygen_config oxygenstyleconfig ) -install(TARGETS kwin_oxygen_config DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install( + TARGETS kwin_oxygen_config + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) diff --git a/kwin/clients/oxygen/demo/CMakeLists.txt b/kwin/clients/oxygen/demo/CMakeLists.txt index efa6370d..8fdeb569 100644 --- a/kwin/clients/oxygen/demo/CMakeLists.txt +++ b/kwin/clients/oxygen/demo/CMakeLists.txt @@ -21,4 +21,7 @@ target_link_libraries(oxygen-shadow-demo ) ########### install files ############### -install(TARGETS oxygen-shadow-demo ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS oxygen-shadow-demo + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/kwin/libkdecorations/CMakeLists.txt b/kwin/libkdecorations/CMakeLists.txt index 1f9db17d..44b2c521 100644 --- a/kwin/libkdecorations/CMakeLists.txt +++ b/kwin/libkdecorations/CMakeLists.txt @@ -13,15 +13,21 @@ target_link_libraries(kdecorations PRIVATE ${KDE4_KDEUI_LIBS}) target_link_libraries(kdecorations PUBLIC ${KDE4_KDEUI_LIBS}) set_target_properties(kdecorations PROPERTIES - VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION} - ) -install(TARGETS kdecorations EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) +install( + TARGETS kdecorations + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) ########### install files ############### -install( FILES +install( + FILES kdecoration.h kdecorationfactory.h kcommondecoration.h - DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} COMPONENT Devel ) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} +) diff --git a/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMakeLists.txt index dbd86dd5..c2777e19 100644 --- a/kwin/libkwineffects/CMakeLists.txt +++ b/kwin/libkwineffects/CMakeLists.txt @@ -38,13 +38,22 @@ target_link_libraries(kwineffects PRIVATE ${kwineffects_XLIB_LIBS} ${kwineffects_XCB_LIBS} ) -set_target_properties(kwineffects PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) +set_target_properties(kwineffects PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) -install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kwineffects + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) -install( FILES +install( + FILES kwinglobals.h kwineffects.h kwinanimationeffect.h kwinxrenderutils.h - DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} +) diff --git a/libs/konq/CMakeLists.txt b/libs/konq/CMakeLists.txt index 164621fa..41b006e8 100644 --- a/libs/konq/CMakeLists.txt +++ b/libs/konq/CMakeLists.txt @@ -31,7 +31,11 @@ set_target_properties(konq PROPERTIES SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS konq EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS konq + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) ########### install files ############### @@ -53,9 +57,9 @@ install(FILES konqmimedata.h kversioncontrolplugin.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} - COMPONENT Devel ) -install(FILES +install( + FILES konqpopupmenuplugin.desktop konqdndpopupmenuplugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} diff --git a/libs/ksysguard/ksgrd/CMakeLists.txt b/libs/ksysguard/ksgrd/CMakeLists.txt index d5482f17..74515699 100644 --- a/libs/ksysguard/ksgrd/CMakeLists.txt +++ b/libs/ksysguard/ksgrd/CMakeLists.txt @@ -1,6 +1,3 @@ - - - ########### next target ############### set(ksgrd_LIB_SRCS @@ -12,16 +9,26 @@ set(ksgrd_LIB_SRCS add_library(ksgrd SHARED ${ksgrd_LIB_SRCS}) +target_link_libraries(ksgrd + ${KDE4_KDECORE_LIBS} + ${QT_QTCORE_LIBRARY} + ${QT_QTNETWORK_LIBRARY} +) -target_link_libraries(ksgrd ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) - -set_target_properties(ksgrd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS ksgrd EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) +set_target_properties(ksgrd PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) +install( + TARGETS ksgrd + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) ########### install files ############### -install(FILES SensorAgent.h SensorClient.h SensorManager.h SensorShellAgent.h SensorSocketAgent.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksgrd COMPONENT Devel) - - - +install( + FILES SensorAgent.h SensorClient.h SensorManager.h SensorShellAgent.h SensorSocketAgent.h + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksgrd +) diff --git a/libs/ksysguard/lsofui/CMakeLists.txt b/libs/ksysguard/lsofui/CMakeLists.txt index 26ae9403..4f95d9ed 100644 --- a/libs/ksysguard/lsofui/CMakeLists.txt +++ b/libs/ksysguard/lsofui/CMakeLists.txt @@ -7,15 +7,17 @@ set(lsofui_LIB_SRCS ) add_library(lsofui SHARED ${lsofui_LIB_SRCS}) +target_link_libraries(lsofui ${KDE4_KIO_LIBS}) -target_link_libraries(lsofui ${KDE4_KIO_LIBS} ) set_target_properties(lsofui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) + install( TARGETS lsofui - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) ########### install files ############### @@ -23,14 +25,17 @@ install( install( FILES lsof.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard - COMPONENT Devel ) kde4_add_widget(ksysguardlsofwidgets_SRCS ksysguardlsof.widgets) kde4_add_plugin(ksysguardlsofwidgets ${ksysguardlsofwidgets_SRCS}) -target_link_libraries(ksysguardlsofwidgets ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} lsofui) +target_link_libraries(ksysguardlsofwidgets + ${KDE4_KDECORE_LIBS} + ${QT_QTGUI_LIBRARY} + lsofui +) install( TARGETS ksysguardlsofwidgets diff --git a/libs/ksysguard/processcore/CMakeLists.txt b/libs/ksysguard/processcore/CMakeLists.txt index 9343ca44..60abfeae 100644 --- a/libs/ksysguard/processcore/CMakeLists.txt +++ b/libs/ksysguard/processcore/CMakeLists.txt @@ -26,7 +26,8 @@ set_target_properties(processcore PROPERTIES install( TARGETS processcore - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) ########### install files ############### @@ -36,7 +37,6 @@ install( processes.h process.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard - COMPONENT Devel ) #------ KAuth stuff diff --git a/libs/ksysguard/processui/CMakeLists.txt b/libs/ksysguard/processui/CMakeLists.txt index 61a98ad4..f801218b 100644 --- a/libs/ksysguard/processui/CMakeLists.txt +++ b/libs/ksysguard/processui/CMakeLists.txt @@ -28,7 +28,8 @@ set_target_properties(processui install( TARGETS processui - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) #---------------------- @@ -50,6 +51,5 @@ install( ProcessFilter.h ksysguardprocesslist.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard - COMPONENT Devel ) diff --git a/libs/ksysguard/signalplotter/CMakeLists.txt b/libs/ksysguard/signalplotter/CMakeLists.txt index b07e9e34..b48b56cd 100644 --- a/libs/ksysguard/signalplotter/CMakeLists.txt +++ b/libs/ksysguard/signalplotter/CMakeLists.txt @@ -3,7 +3,6 @@ set(ksignalplotter_LIB_SRCS ) add_library(ksignalplotter SHARED ${ksignalplotter_LIB_SRCS}) - target_link_libraries(ksignalplotter PUBLIC ${KDE4_KDEUI_LIBS}) set_target_properties(ksignalplotter @@ -13,7 +12,8 @@ set_target_properties(ksignalplotter install( TARGETS ksignalplotter - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) #---------------------- @@ -22,7 +22,10 @@ kde4_add_widget(ksignalplotterwidgets_SRCS ksignalplotter.widgets) kde4_add_plugin(ksignalplotterwidgets ${ksignalplotterwidgets_SRCS} ${ksignalplotterwidgets_PART_SRCS}) -target_link_libraries(ksignalplotterwidgets ${KDE4_KDEUI_LIBS} ksignalplotter) +target_link_libraries(ksignalplotterwidgets + ${KDE4_KDEUI_LIBS} + ksignalplotter +) install( TARGETS ksignalplotterwidgets @@ -32,5 +35,4 @@ install( install( FILES ksignalplotter.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard - COMPONENT Devel ) diff --git a/libs/kworkspace/CMakeLists.txt b/libs/kworkspace/CMakeLists.txt index d2673b5c..ac2d9091 100644 --- a/libs/kworkspace/CMakeLists.txt +++ b/libs/kworkspace/CMakeLists.txt @@ -37,7 +37,8 @@ generate_export_header(kworkspace) install( TARGETS kworkspace - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) install( @@ -47,5 +48,4 @@ install( kworkspace.h ${CMAKE_CURRENT_BINARY_DIR}/kworkspace_export.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kworkspace - COMPONENT Devel ) diff --git a/libs/oxygen/CMakeLists.txt b/libs/oxygen/CMakeLists.txt index b7754c9c..15ba38c8 100644 --- a/libs/oxygen/CMakeLists.txt +++ b/libs/oxygen/CMakeLists.txt @@ -12,20 +12,20 @@ kde4_add_kcfg_files(oxygenstyle_LIB_SRCS ) add_library(oxygenstyle SHARED ${oxygenstyle_LIB_SRCS}) - target_link_libraries(oxygenstyle PUBLIC ${KDE4_KDEUI_LIBS} ) - -if ( X11_FOUND ) - target_link_libraries(oxygenstyle PRIVATE ${X11_LIBRARIES}) -endif( X11_FOUND ) +target_link_libraries(oxygenstyle PRIVATE ${X11_LIBRARIES}) set_target_properties(oxygenstyle PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS oxygenstyle ${INSTALL_TARGETS_DEFAULT_ARGS} ) + +install( + TARGETS oxygenstyle + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) # next target set(oxygenstyleconfig_LIB_SRCS @@ -44,16 +44,17 @@ target_link_libraries(oxygenstyleconfig PUBLIC ${KDE4_KDEUI_LIBS} oxygenstyle ) - -if ( X11_FOUND ) - target_link_libraries(oxygenstyleconfig PRIVATE ${X11_LIBRARIES}) -endif( X11_FOUND ) +target_link_libraries(oxygenstyleconfig PRIVATE ${X11_LIBRARIES}) set_target_properties(oxygenstyleconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS oxygenstyleconfig ${INSTALL_TARGETS_DEFAULT_ARGS}) + +install( + TARGETS oxygenstyleconfig + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) generate_export_header(oxygenstyle BASE_NAME oxygen) diff --git a/libs/plasmaclock/CMakeLists.txt b/libs/plasmaclock/CMakeLists.txt index b9bf5d56..f9e49931 100644 --- a/libs/plasmaclock/CMakeLists.txt +++ b/libs/plasmaclock/CMakeLists.txt @@ -30,9 +30,9 @@ install( calendartable.h ${CMAKE_CURRENT_BINARY_DIR}/plasmaclock_export.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaclock - COMPONENT Devel ) install( TARGETS plasmaclock - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) diff --git a/libs/plasmagenericshell/CMakeLists.txt b/libs/plasmagenericshell/CMakeLists.txt index d40e02cf..ebcd12ed 100644 --- a/libs/plasmagenericshell/CMakeLists.txt +++ b/libs/plasmagenericshell/CMakeLists.txt @@ -69,6 +69,13 @@ install( PATTERN "Messages.sh" EXCLUDE ) -install(TARGETS plasmagenericshell EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -INSTALL(FILES plasma-layout-template.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) +install( + TARGETS plasmagenericshell + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) +install( + FILES plasma-layout-template.desktop + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} +) diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt index 97fa18a2..ef4891cd 100644 --- a/libs/taskmanager/CMakeLists.txt +++ b/libs/taskmanager/CMakeLists.txt @@ -49,7 +49,8 @@ generate_export_header(taskmanager) install( TARGETS taskmanager - EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT kdeworkspaceLibraryTargets + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) install(FILES @@ -65,7 +66,7 @@ install(FILES taskitem.h taskmanager.h ${CMAKE_CURRENT_BINARY_DIR}/taskmanager_export.h - DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/taskmanager ) diff --git a/plasma/applets/kickoff/CMakeLists.txt b/plasma/applets/kickoff/CMakeLists.txt index b5528e8c..0b36ef4a 100644 --- a/plasma/applets/kickoff/CMakeLists.txt +++ b/plasma/applets/kickoff/CMakeLists.txt @@ -38,7 +38,10 @@ target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS}) generate_export_header(kickoff) -install(TARGETS kickoff ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kickoff + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) ####################################################################################### # Kickoff Plasma Applet @@ -119,5 +122,5 @@ install( # set(Application_SRCS ${Kickoff_SRCS} main.cpp) # add_executable(kickoff ${Application_SRCS}) # target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS}) -# install(TARGETS kickoff ${INSTALL_TARGETS_DEFAULT_ARGS}) +# install(TARGETS kickoff DESTINATION ${KDE4_BIN_INSTALL_DIR}) #ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/plasma/applets/system-monitor/CMakeLists.txt b/plasma/applets/system-monitor/CMakeLists.txt index e1e32797..e99c933b 100644 --- a/plasma/applets/system-monitor/CMakeLists.txt +++ b/plasma/applets/system-monitor/CMakeLists.txt @@ -98,7 +98,7 @@ target_link_libraries(plasma_applet_system-monitor ${KDE4_PLASMA_LIBS} ${KDE4_KD # Install install( TARGETS plasma_applet-system-monitor - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) install( TARGETS diff --git a/plasma/dataengines/geolocation/CMakeLists.txt b/plasma/dataengines/geolocation/CMakeLists.txt index 03d08fdc..b117a310 100644 --- a/plasma/dataengines/geolocation/CMakeLists.txt +++ b/plasma/dataengines/geolocation/CMakeLists.txt @@ -16,19 +16,20 @@ set_target_properties(plasma-geolocation-interface PROPERTIES generate_export_header(plasma-geolocation-interface BASE_NAME geolocation) -install(TARGETS plasma-geolocation-interface ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS plasma-geolocation-interface + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) install( FILES geolocationprovider.h ${CMAKE_CURRENT_BINARY_DIR}/geolocation_export.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/geolocation - COMPONENT Devel ) #install(FILES includes/Interface -# DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma/Geolocation -# COMPONENT Devel) +# DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma/Geolocation) # ------------------------------------------------------------------------------------------------- set(plasma_dataengine_geolocation_SRCS geolocation.cpp) diff --git a/plasma/dataengines/weather/CMakeLists.txt b/plasma/dataengines/weather/CMakeLists.txt index 1b0ccb50..cef7f9aa 100644 --- a/plasma/dataengines/weather/CMakeLists.txt +++ b/plasma/dataengines/weather/CMakeLists.txt @@ -2,11 +2,22 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/ions ) - 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} weather_ion) -INSTALL (TARGETS plasma_engine_weather DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -INSTALL (FILES plasma-dataengine-weather.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +TARGET_LINK_LIBRARIES(plasma_engine_weather + ${KDE4_KIO_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PLASMA_LIBS} + weather_ion +) + +INSTALL( + TARGETS plasma_engine_weather + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) +INSTALL( + FILES plasma-dataengine-weather.desktop + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} +) diff --git a/plasma/dataengines/weather/ions/CMakeLists.txt b/plasma/dataengines/weather/ions/CMakeLists.txt index bfb3a5b1..050a7e28 100644 --- a/plasma/dataengines/weather/ions/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/CMakeLists.txt @@ -17,7 +17,7 @@ generate_export_header(weather_ion BASE_NAME ion) install( TARGETS weather_ion EXPORT kdeworkspaceLibraryTargets - ${INSTALL_TARGETS_DEFAULT_ARGS} + DESTINATION ${KDE4_LIB_INSTALL_DIR} ) install( @@ -25,13 +25,11 @@ install( ion.h ${CMAKE_CURRENT_BINARY_DIR}/ion_export.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/weather - COMPONENT Devel ) install( FILES includes/Ion DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma/Weather - COMPONENT Devel ) # the individual ion plugins diff --git a/plasma/shells/plasma-desktop/CMakeLists.txt b/plasma/shells/plasma-desktop/CMakeLists.txt index 6332c6dc..649208fa 100644 --- a/plasma/shells/plasma-desktop/CMakeLists.txt +++ b/plasma/shells/plasma-desktop/CMakeLists.txt @@ -43,18 +43,27 @@ target_link_libraries(plasma-desktop ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} + ${X11_LIBRARIES} kworkspace plasmagenericshell ) -if(UNIX AND Q_WS_X11) - target_link_libraries(plasma-desktop ${X11_LIBRARIES}) -endif(UNIX AND Q_WS_X11) - -install(TARGETS plasma-desktop ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES data/plasma-desktop.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) -install(FILES data/plasma-shell-desktop.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) -install(FILES data/plasma-desktop-js.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/katepart/syntax/) +install( + TARGETS plasma-desktop + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) +install( + FILES data/plasma-desktop.desktop + DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR} +) +install( + FILES data/plasma-shell-desktop.kcfg + DESTINATION ${KDE4_KCFG_INSTALL_DIR} +) +install( + FILES data/plasma-desktop-js.xml + DESTINATION ${KDE4_DATA_INSTALL_DIR}/katepart/syntax/ +) install( FILES data/plasma-desktoprc DESTINATION ${KDE4_CONFIG_INSTALL_DIR} diff --git a/plasma/shells/plasma-windowed/CMakeLists.txt b/plasma/shells/plasma-windowed/CMakeLists.txt index e06b54c3..f45ea4cf 100644 --- a/plasma/shells/plasma-windowed/CMakeLists.txt +++ b/plasma/shells/plasma-windowed/CMakeLists.txt @@ -1,4 +1,7 @@ -include_directories(${CMAKE_SOURCE_DIR}/libs ${CMAKE_SOURCE_DIR}/libs/kworkspace) +include_directories( + ${CMAKE_SOURCE_DIR}/libs + ${CMAKE_SOURCE_DIR}/libs/kworkspace +) set(plasma-windowed_SRCS @@ -8,10 +11,18 @@ set(plasma-windowed_SRCS ${appletbrowserdialog_SRCS} ) - add_executable(plasma-windowed ${plasma-windowed_SRCS}) -target_link_libraries(plasma-windowed ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ) +target_link_libraries(plasma-windowed + ${KDE4_PLASMA_LIBS} + ${KDE4_KIO_LIBS} + ${X11_LIBRARIES} + ${KDE4_KFILE_LIBS} + kworkspace +) -install(TARGETS plasma-windowed ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS plasma-windowed + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/solid-actions-kcm/CMakeLists.txt b/solid-actions-kcm/CMakeLists.txt index 25773f60..a637327c 100644 --- a/solid-actions-kcm/CMakeLists.txt +++ b/solid-actions-kcm/CMakeLists.txt @@ -29,9 +29,23 @@ TARGET_LINK_LIBRARIES(solid-action-desktop-gen ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIB ########### install files ############### -INSTALL( TARGETS kcm_solid_actions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -INSTALL( TARGETS solid-action-desktop-gen ${INSTALL_TARGETS_DEFAULT_ARGS} ) -INSTALL( FILES solid-actions.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -INSTALL( FILES solid-action-template.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmsolidactions ) -INSTALL( FILES solid-device-type.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) +INSTALL( + TARGETS kcm_solid_actions + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} +) +INSTALL( + TARGETS solid-action-desktop-gen + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) +INSTALL( + FILES solid-actions.desktop + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +INSTALL( + FILES solid-action-template.desktop + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmsolidactions +) +INSTALL( + FILES solid-device-type.desktop + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} +) diff --git a/solid-hardware/CMakeLists.txt b/solid-hardware/CMakeLists.txt index ca3f50b2..402d3c65 100644 --- a/solid-hardware/CMakeLists.txt +++ b/solid-hardware/CMakeLists.txt @@ -4,9 +4,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}) -install(TARGETS solid-hardware ${INSTALL_TARGETS_DEFAULT_ARGS}) - -########### install files ############### - - - +install( + TARGETS solid-hardware + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) diff --git a/systemsettings/app/CMakeLists.txt b/systemsettings/app/CMakeLists.txt index 85dd8120..698a156f 100644 --- a/systemsettings/app/CMakeLists.txt +++ b/systemsettings/app/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ToolTips ) -SET( systemsettings_SRCS +set( systemsettings_SRCS SystemSettingsApp.cpp SettingsBase.cpp ToolTips/ktooltip.cpp @@ -9,13 +9,28 @@ SET( systemsettings_SRCS main.cpp configDialog.ui ) + KDE4_ADD_KCFG_FILES( systemsettings_SRCS BaseConfig.kcfgc ) QT4_ADD_DBUS_ADAPTOR( systemsettings_SRCS org.kde.systemsettings.xml SystemSettingsApp.h SystemSettingsApp ) -add_executable( systemsettings ${systemsettings_SRCS}) +add_executable(systemsettings ${systemsettings_SRCS}) -TARGET_LINK_LIBRARIES( systemsettings ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS} systemsettingsview ) +target_link_libraries(systemsettings + ${KDE4_PLASMA_LIBS} + ${KDE4_KIO_LIBS} + ${KDE4_KCMUTILS_LIBS} + systemsettingsview +) -INSTALL( TARGETS systemsettings ${INSTALL_TARGETS_DEFAULT_ARGS} ) -INSTALL( FILES systemsettingsui.rc systemsettings.kcfg DESTINATION ${KDE4_DATA_INSTALL_DIR}/systemsettings ) -INSTALL( PROGRAMS kdesystemsettings.desktop systemsettings.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) +install( + TARGETS systemsettings + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) +install( + FILES systemsettingsui.rc systemsettings.kcfg + DESTINATION ${KDE4_DATA_INSTALL_DIR}/systemsettings +) +install( + PROGRAMS kdesystemsettings.desktop systemsettings.desktop + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} +) diff --git a/systemsettings/core/CMakeLists.txt b/systemsettings/core/CMakeLists.txt index 8db82c54..32068c13 100644 --- a/systemsettings/core/CMakeLists.txt +++ b/systemsettings/core/CMakeLists.txt @@ -18,11 +18,23 @@ set(systemsettingsview_LIB_HDRS ) add_library(systemsettingsview SHARED ${systemsettingsview_LIB_SRCS}) - -target_link_libraries(systemsettingsview ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS}) +target_link_libraries(systemsettingsview + ${KDE4_KDECORE_LIBS} + ${KDE4_KIO_LIBS} + ${KDE4_KCMUTILS_LIBS} +) generate_export_header(systemsettingsview) -install( TARGETS systemsettingsview ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( FILES ${systemsettingsview_LIB_HDRS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/systemsettingsview COMPONENT Devel) -INSTALL( FILES systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) +install( + TARGETS systemsettingsview + DESTINATION ${KDE4_LIB_INSTALL_DIR} +) +install( + FILES ${systemsettingsview_LIB_HDRS} + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/systemsettingsview +) +install( + FILES systemsettingsview.desktop systemsettingsexternalapp.desktop + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} +)