diff --git a/CMakeLists.txt b/CMakeLists.txt index 43667b57..4a09f546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -291,8 +291,8 @@ macro_optional_add_subdirectory(localization) macro_optional_add_subdirectory(kde-menu) ########### install files ############### -# install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kde4 DESTINATION ${BIN_INSTALL_DIR}) -install(PROGRAMS ${CMAKE_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR}) +# install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR}) +install(PROGRAMS ${CMAKE_BINARY_DIR}/startkde DESTINATION ${KDE4_BIN_INSTALL_DIR}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -315,30 +315,30 @@ macro(MAKE_INSTALL_PATH_ABSOLUTE out in) endif (IS_ABSOLUTE "${in}") endmacro(MAKE_INSTALL_PATH_ABSOLUTE out in) -make_install_path_absolute(KDE4WORKSPACE_LIB_DIR ${LIB_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_LIBEXEC_DIR ${LIBEXEC_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_BIN_DIR ${BIN_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_SBIN_DIR ${SBIN_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_DATA_DIR ${DATA_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_CONFIG_DIR ${CONFIG_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_ICON_DIR ${ICON_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_KCFG_DIR ${KCFG_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_LOCALE_DIR ${LOCALE_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_MIME_DIR ${MIME_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_SOUND_DIR ${SOUND_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_TEMPLATES_DIR ${TEMPLATES_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_WALLPAPER_DIR ${WALLPAPER_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_AUTOSTART_DIR ${AUTOSTART_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_XDG_APPS_DIR ${XDG_APPS_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_XDG_DIRECTORY_DIR ${XDG_DIRECTORY_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_SYSCONF_DIR ${SYSCONF_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_MAN_DIR ${MAN_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_INFO_DIR ${INFO_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_DBUS_INTERFACES_DIR ${DBUS_INTERFACES_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_DBUS_SERVICES_DIR ${DBUS_SERVICES_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_SERVICES_DIR ${SERVICES_INSTALL_DIR}) -make_install_path_absolute(KDE4WORKSPACE_SERVICETYPES_DIR ${SERVICETYPES_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_LIB_DIR ${KDE4_LIB_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_LIBEXEC_DIR ${KDE4_LIBEXEC_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_BIN_DIR ${KDE4_BIN_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_SBIN_DIR ${KDE4_SBIN_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_DATA_DIR ${KDE4_DATA_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_CONFIG_DIR ${KDE4_CONFIG_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_ICON_DIR ${KDE4_ICON_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_KCFG_DIR ${KDE4_KCFG_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_LOCALE_DIR ${KDE4_LOCALE_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_MIME_DIR ${KDE4_MIME_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_SOUND_DIR ${KDE4_SOUND_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_TEMPLATES_DIR ${KDE4_TEMPLATES_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_WALLPAPER_DIR ${KDE4_WALLPAPER_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_AUTOSTART_DIR ${KDE4_AUTOSTART_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_XDG_APPS_DIR ${KDE4_XDG_APPS_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_XDG_DIRECTORY_DIR ${KDE4_XDG_DIRECTORY_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_SYSCONF_DIR ${KDE4_SYSCONF_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_MAN_DIR ${KDE4_MAN_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_INFO_DIR ${KDE4_INFO_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_DBUS_INTERFACES_DIR ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_DBUS_SERVICES_DIR ${KDE4_DBUS_SERVICES_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_SERVICES_DIR ${KDE4_SERVICES_INSTALL_DIR}) +make_install_path_absolute(KDE4WORKSPACE_SERVICETYPES_DIR ${KDE4_SERVICETYPES_INSTALL_DIR}) set(KDE4WORKSPACE_TARGET_PREFIX KDE4Workspace::) @@ -357,7 +357,7 @@ install( FILES ${CMAKE_BINARY_DIR}/KDE4WorkspaceConfig.cmake ${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake - DESTINATION ${DATA_INSTALL_DIR}/cmake/modules + DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules ) # run a script before installing the exports files which deletes previously @@ -367,14 +367,14 @@ install( # targets with different names. install( CODE "set(EXPORT_FILES KDE4WorkspaceLibraryTargets.cmake)" - CODE "set(EXPORT_INSTALL_DIR \"${DATA_INSTALL_DIR}/cmake/modules\")" + CODE "set(EXPORT_INSTALL_DIR \"${KDE4_DATA_INSTALL_DIR}/cmake/modules\")" SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" ) install( EXPORT kdeworkspaceLibraryTargets NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX} - DESTINATION ${DATA_INSTALL_DIR}/cmake/modules + DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules FILE KDE4WorkspaceLibraryTargets.cmake ) diff --git a/CPackConfig.cmake b/CPackConfig.cmake deleted file mode 100644 index 24d09b74..00000000 --- a/CPackConfig.cmake +++ /dev/null @@ -1,11 +0,0 @@ -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Set of desktop applications, part of Katana project") -set(CPACK_PACKAGE_VENDOR "kde-workspace") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") -set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git;${CPACK_SOURCE_IGNORE_FILES}") -set(CPACK_PACKAGE_INSTALL_DIRECTORY ${KDE4_INSTALL_DIR}) -set(CPACK_PACKAGE_VERSION_MAJOR ${KDE_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${KDE_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${KDE_VERSION_RELEASE}) -SET(CPACK_GENERATOR "TBZ2;TXZ") -SET(CPACK_SOURCE_GENERATOR "TBZ2;TXZ") diff --git a/CTestConfig.cmake b/CTestConfig.cmake deleted file mode 100644 index 39923cf5..00000000 --- a/CTestConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -set(CTEST_PROJECT_NAME "kde-workspace") diff --git a/appmenu/CMakeLists.txt b/appmenu/CMakeLists.txt index 062f020a..6a0b8f7f 100644 --- a/appmenu/CMakeLists.txt +++ b/appmenu/CMakeLists.txt @@ -50,18 +50,18 @@ endif() install( TARGETS kded_appmenu - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES appmenu.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kded + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) install( FILES com.canonical.AppMenu.Registrar.xml org.kde.kded.appmenu.xml - DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake index 54cdc60f..4faa799c 100644 --- a/config-workspace.h.cmake +++ b/config-workspace.h.cmake @@ -118,13 +118,13 @@ #cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}" /* KDE's binaries directory */ -#define KDE_BINDIR "${BIN_INSTALL_DIR}" +#define KDE_BINDIR "${KDE4_BIN_INSTALL_DIR}" /* KDE's configuration directory */ -#define KDE_CONFDIR "${CONFIG_INSTALL_DIR}" +#define KDE_CONFDIR "${KDE4_CONFIG_INSTALL_DIR}" /* KDE's static data directory */ -#define KDE_DATADIR "${DATA_INSTALL_DIR}" +#define KDE_DATADIR "${KDE4_DATA_INSTALL_DIR}" /* Define where your java executable is */ #undef PATH_JAVA diff --git a/cursors/CMakeLists.txt b/cursors/CMakeLists.txt index 78861bad..59719bd4 100644 --- a/cursors/CMakeLists.txt +++ b/cursors/CMakeLists.txt @@ -8,6 +8,6 @@ set(cursors_folders foreach(theme ${cursors_folders}) install( DIRECTORY ${theme} - DESTINATION ${ICON_INSTALL_DIR} + DESTINATION ${KDE4_ICON_INSTALL_DIR} ) endforeach() diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt index 83511d09..b1dcb4fd 100644 --- a/drkonqi/CMakeLists.txt +++ b/drkonqi/CMakeLists.txt @@ -58,4 +58,4 @@ target_link_libraries(drkonqi ${KDE4_KIO_LIBS} ) -install(TARGETS drkonqi DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS drkonqi DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/drkonqi/data/CMakeLists.txt b/drkonqi/data/CMakeLists.txt index d8a73f6c..36b62601 100644 --- a/drkonqi/data/CMakeLists.txt +++ b/drkonqi/data/CMakeLists.txt @@ -1,9 +1,9 @@ install( FILES crash.png - DESTINATION ${DATA_INSTALL_DIR}/drkonqi/pics + DESTINATION ${KDE4_DATA_INSTALL_DIR}/drkonqi/pics ) install( DIRECTORY debuggers - DESTINATION ${DATA_INSTALL_DIR}/drkonqi + DESTINATION ${KDE4_DATA_INSTALL_DIR}/drkonqi PATTERN ".svn" EXCLUDE ) diff --git a/freespacenotifier/CMakeLists.txt b/freespacenotifier/CMakeLists.txt index f762b1b1..cf1c96d8 100644 --- a/freespacenotifier/CMakeLists.txt +++ b/freespacenotifier/CMakeLists.txt @@ -19,20 +19,20 @@ target_link_libraries(kded_freespacenotifier ${KDE4_KIO_LIBS}) install( TARGETS kded_freespacenotifier - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES freespacenotifier.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kded + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) install( FILES freespacenotifier.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/freespacenotifier + DESTINATION ${KDE4_DATA_INSTALL_DIR}/freespacenotifier ) install( FILES freespacenotifier.kcfg - DESTINATION ${KCFG_INSTALL_DIR} + DESTINATION ${KDE4_KCFG_INSTALL_DIR} ) diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt index a0c0f013..e67fbc66 100644 --- a/kcheckpass/CMakeLists.txt +++ b/kcheckpass/CMakeLists.txt @@ -27,9 +27,9 @@ target_link_libraries(kcheckpass install( TARGETS kcheckpass - DESTINATION ${LIBEXEC_INSTALL_DIR} + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) install(CODE " - set(KCP_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/kcheckpass\") + set(KCP_PATH \"\$ENV{DESTDIR}${KDE4_LIBEXEC_INSTALL_DIR}/kcheckpass\") EXECUTE_PROCESS(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\") ") diff --git a/kcminit/CMakeLists.txt b/kcminit/CMakeLists.txt index 587e6b34..bab2b448 100644 --- a/kcminit/CMakeLists.txt +++ b/kcminit/CMakeLists.txt @@ -16,6 +16,6 @@ install( ########### next target ############### install( - CODE "MESSAGE(STATUS \"Symlinking: ${BIN_INSTALL_DIR}/kcminit to: ${BIN_INSTALL_DIR}/kcminit_startup\")" - CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/kcminit ${BIN_INSTALL_DIR}/kcminit_startup)" + CODE "MESSAGE(STATUS \"Symlinking: ${KDE4_BIN_INSTALL_DIR}/kcminit to: ${KDE4_BIN_INSTALL_DIR}/kcminit_startup\")" + CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${KDE4_BIN_INSTALL_DIR}/kcminit ${KDE4_BIN_INSTALL_DIR}/kcminit_startup)" ) diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt index f4cb65ae..91b7a13e 100644 --- a/kcontrol/access/CMakeLists.txt +++ b/kcontrol/access/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(kcm_access install( TARGETS kcm_access - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) @@ -40,9 +40,9 @@ install( FILES kcmaccess.desktop kaccess.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES kaccess.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/kaccess + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kaccess ) diff --git a/kcontrol/autostart/CMakeLists.txt b/kcontrol/autostart/CMakeLists.txt index 8204a3e2..593b1e6d 100644 --- a/kcontrol/autostart/CMakeLists.txt +++ b/kcontrol/autostart/CMakeLists.txt @@ -19,9 +19,9 @@ target_link_libraries(kcm_autostart ${KDE4_KIO_LIBS}) install( TARGETS kcm_autostart - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES autostart.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/colors/CMakeLists.txt b/kcontrol/colors/CMakeLists.txt index 2dacf9d2..c52cc6ac 100644 --- a/kcontrol/colors/CMakeLists.txt +++ b/kcontrol/colors/CMakeLists.txt @@ -14,15 +14,15 @@ target_link_libraries(kcm_colors install( TARGETS kcm_colors - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES colors.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES colorschemes.knsrc - DESTINATION ${CONFIG_INSTALL_DIR} + DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) install( @@ -36,5 +36,5 @@ install( schemes/WontonSoup.colors schemes/Zion.colors schemes/ZionReversed.colors - DESTINATION ${DATA_INSTALL_DIR}/color-schemes + DESTINATION ${KDE4_DATA_INSTALL_DIR}/color-schemes ) diff --git a/kcontrol/componentchooser/CMakeLists.txt b/kcontrol/componentchooser/CMakeLists.txt index ac11e37b..d60fc84b 100644 --- a/kcontrol/componentchooser/CMakeLists.txt +++ b/kcontrol/componentchooser/CMakeLists.txt @@ -30,12 +30,12 @@ target_link_libraries(kcm_componentchooser ${KDE4_KIO_LIBS}) install( TARGETS kcm_componentchooser - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES componentchooser.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/componentchooser/componentservices/CMakeLists.txt b/kcontrol/componentchooser/componentservices/CMakeLists.txt index cfed0597..1c615b8d 100644 --- a/kcontrol/componentchooser/componentservices/CMakeLists.txt +++ b/kcontrol/componentchooser/componentservices/CMakeLists.txt @@ -5,5 +5,5 @@ install( kcm_filemanager.desktop kcm_terminal.desktop kcm_wm.desktop - DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcm_componentchooser ) diff --git a/kcontrol/componentchooser/windowmanagers/CMakeLists.txt b/kcontrol/componentchooser/windowmanagers/CMakeLists.txt index b8b4d021..939af5b7 100644 --- a/kcontrol/componentchooser/windowmanagers/CMakeLists.txt +++ b/kcontrol/componentchooser/windowmanagers/CMakeLists.txt @@ -8,5 +8,5 @@ install( metacity.desktop openbox.desktop xfwm4.desktop - DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksmserver/windowmanagers ) diff --git a/kcontrol/dateandtime/CMakeLists.txt b/kcontrol/dateandtime/CMakeLists.txt index 236713c5..5a1dd6a8 100644 --- a/kcontrol/dateandtime/CMakeLists.txt +++ b/kcontrol/dateandtime/CMakeLists.txt @@ -13,7 +13,7 @@ target_link_libraries(kcm_clock install( TARGETS kcm_clock - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### @@ -24,7 +24,7 @@ target_link_libraries(kcmdatetimehelper ${KDE4_KDECORE_LIBS}) install( TARGETS kcmdatetimehelper - DESTINATION ${LIBEXEC_INSTALL_DIR} + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) kde4_install_auth_helper_files( @@ -37,5 +37,5 @@ kde4_install_auth_helper_files( install( FILES clock.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/desktoppaths/CMakeLists.txt b/kcontrol/desktoppaths/CMakeLists.txt index d447f813..4d754d76 100644 --- a/kcontrol/desktoppaths/CMakeLists.txt +++ b/kcontrol/desktoppaths/CMakeLists.txt @@ -12,10 +12,10 @@ target_link_libraries(kcm_desktoppaths install( TARGETS kcm_desktoppaths - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES desktoppath.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/desktoptheme/CMakeLists.txt b/kcontrol/desktoptheme/CMakeLists.txt index 914752d8..401d9cb5 100644 --- a/kcontrol/desktoptheme/CMakeLists.txt +++ b/kcontrol/desktoptheme/CMakeLists.txt @@ -18,13 +18,13 @@ target_link_libraries(kcm_desktoptheme install( TARGETS kcm_desktoptheme - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES desktoptheme.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt index 2df2b6c9..e3a7de3b 100644 --- a/kcontrol/dnssd/CMakeLists.txt +++ b/kcontrol/dnssd/CMakeLists.txt @@ -9,12 +9,12 @@ target_link_libraries(kcm_kdnssd install( TARGETS kcm_kdnssd - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES kcm_kdnssd.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/emoticons/CMakeLists.txt b/kcontrol/emoticons/CMakeLists.txt index 833d0e8d..f5ed3022 100644 --- a/kcontrol/emoticons/CMakeLists.txt +++ b/kcontrol/emoticons/CMakeLists.txt @@ -10,14 +10,14 @@ target_link_libraries(kcm_emoticons install( TARGETS kcm_emoticons - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES emoticons.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES emoticons.knsrc - DESTINATION ${CONFIG_INSTALL_DIR} + DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) diff --git a/kcontrol/fonts/CMakeLists.txt b/kcontrol/fonts/CMakeLists.txt index 91146fa0..d9419e2c 100644 --- a/kcontrol/fonts/CMakeLists.txt +++ b/kcontrol/fonts/CMakeLists.txt @@ -37,10 +37,10 @@ endif(Q_WS_X11) install( TARGETS kcm_fonts - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES fonts.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/hardware/display/CMakeLists.txt b/kcontrol/hardware/display/CMakeLists.txt index 040fca2e..f788b3df 100644 --- a/kcontrol/hardware/display/CMakeLists.txt +++ b/kcontrol/hardware/display/CMakeLists.txt @@ -10,12 +10,12 @@ target_link_libraries(kcm_display install( TARGETS kcm_display - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES display.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/hardware/joystick/CMakeLists.txt b/kcontrol/hardware/joystick/CMakeLists.txt index 7644de04..b690a0cf 100644 --- a/kcontrol/hardware/joystick/CMakeLists.txt +++ b/kcontrol/hardware/joystick/CMakeLists.txt @@ -20,10 +20,10 @@ target_link_libraries(kcm_joystick install( TARGETS kcm_joystick - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES joystick.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/icons/CMakeLists.txt b/kcontrol/icons/CMakeLists.txt index e794384c..21400530 100644 --- a/kcontrol/icons/CMakeLists.txt +++ b/kcontrol/icons/CMakeLists.txt @@ -18,14 +18,14 @@ target_link_libraries(kcm_icons ${KDE4_KIO_LIBS}) install( TARGETS kcm_icons - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES icons.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES icons.knsrc - DESTINATION ${CONFIG_INSTALL_DIR} + DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index a4c19457..3d5e906d 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -74,7 +74,7 @@ if (X11_Xfixes_FOUND) target_link_libraries(kcm_input ${X11_Xfixes_LIB}) endif (X11_Xfixes_FOUND) -install(TARGETS kcm_input DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_input DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### @@ -93,12 +93,12 @@ if (X11_Xfixes_FOUND) target_link_libraries(kcm_cursortheme ${X11_Xfixes_LIB}) endif (X11_Xfixes_FOUND) -install(TARGETS kcm_cursortheme DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_cursortheme DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES mouse.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES cursortheme.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES xcursor/xcursor.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES mouse.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES cursortheme.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES xcursor/xcursor.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) diff --git a/kcontrol/input/pics/CMakeLists.txt b/kcontrol/input/pics/CMakeLists.txt index 4ef49ea1..263ce885 100644 --- a/kcontrol/input/pics/CMakeLists.txt +++ b/kcontrol/input/pics/CMakeLists.txt @@ -1 +1 @@ -install( FILES mouse_rh.png mouse_lh.png DESTINATION ${DATA_INSTALL_DIR}/kcminput/pics ) +install( FILES mouse_rh.png mouse_lh.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcminput/pics ) diff --git a/kcontrol/kdebug/CMakeLists.txt b/kcontrol/kdebug/CMakeLists.txt index aa8106c3..448e019a 100644 --- a/kcontrol/kdebug/CMakeLists.txt +++ b/kcontrol/kdebug/CMakeLists.txt @@ -9,6 +9,6 @@ kde4_add_plugin(kcm_kdebugconfig ${kdebugconfig_SRCS}) target_link_libraries(kcm_kdebugconfig ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBRARY}) -install(TARGETS kcm_kdebugconfig DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kdebugconfig DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install( FILES kcm_kdebugconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kcm_kdebugconfig.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/kded/CMakeLists.txt b/kcontrol/kded/CMakeLists.txt index 6df7c880..ccdcabaa 100644 --- a/kcontrol/kded/CMakeLists.txt +++ b/kcontrol/kded/CMakeLists.txt @@ -11,9 +11,9 @@ kde4_add_plugin(kcm_kded ${kcm_kded_PART_SRCS}) target_link_libraries(kcm_kded ${KDE4_KDEUI_LIBS}) -install(TARGETS kcm_kded DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_kded DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kcmkded.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kcmkded.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeLists.txt index 3ff73437..0d1e5753 100644 --- a/kcontrol/keyboard/CMakeLists.txt +++ b/kcontrol/keyboard/CMakeLists.txt @@ -43,8 +43,8 @@ if(X11_Xinput_FOUND) target_link_libraries(kded_keyboard ${X11_Xinput_LIB}) endif(X11_Xinput_FOUND) -install( TARGETS kded_keyboard DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES keyboard.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( TARGETS kded_keyboard DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES keyboard.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) ### plasma applet ### @@ -69,8 +69,8 @@ target_link_libraries(plasma_applet_keyboard ${X11_LIBRARIES} ) -install( TARGETS plasma_applet_keyboard DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES plasma_applet_keyboard.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_applet_keyboard DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES plasma_applet_keyboard.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) ### widget lib ### @@ -94,7 +94,7 @@ target_link_libraries(keyboard_layout_widget ${X11_Xkbfile_LIB} ) -install( TARGETS keyboard_layout_widget DESTINATION ${PLUGIN_INSTALL_DIR} ) +install( TARGETS keyboard_layout_widget DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ### kcm keyboard ### @@ -134,9 +134,9 @@ target_link_libraries(kcm_keyboard ${X11_LIBRARIES} ) -install(TARGETS kcm_keyboard DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_keyboard DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kcm_keyboard.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kcm_keyboard.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) add_subdirectory( pics ) diff --git a/kcontrol/keyboard/pics/CMakeLists.txt b/kcontrol/keyboard/pics/CMakeLists.txt index 6d5b7cae..e87e7e74 100644 --- a/kcontrol/keyboard/pics/CMakeLists.txt +++ b/kcontrol/keyboard/pics/CMakeLists.txt @@ -1 +1 @@ -install( FILES epo.png DESTINATION ${DATA_INSTALL_DIR}/kcmkeyboard/pics ) +install( FILES epo.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmkeyboard/pics ) diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt index 57906e21..f49409b6 100644 --- a/kcontrol/keys/CMakeLists.txt +++ b/kcontrol/keys/CMakeLists.txt @@ -23,12 +23,12 @@ qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_component_xml} kglobalaccel kde4_add_plugin(kcm_keys ${kcm_keys_PART_SRCS}) target_link_libraries(kcm_keys ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB}) -install(TARGETS kcm_keys DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_keys DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES keys.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES keys.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES schemes/kde3.kksrc schemes/kde4.kksrc @@ -37,6 +37,6 @@ install( FILES schemes/win3.kksrc schemes/win4.kksrc schemes/wm3.kksrc - DESTINATION ${DATA_INSTALL_DIR}/kcmkeys ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmkeys ) diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt index 254b5313..4dad6cce 100644 --- a/kcontrol/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/CMakeLists.txt @@ -36,6 +36,6 @@ if (X11_Xft_FOUND) add_subdirectory( thumbnail ) add_subdirectory( viewpart ) - kde4_install_icons( ${ICON_INSTALL_DIR} ) + kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) endif (X11_Xft_FOUND) diff --git a/kcontrol/kfontinst/apps/CMakeLists.txt b/kcontrol/kfontinst/apps/CMakeLists.txt index 4b731973..5ff7a9db 100644 --- a/kcontrol/kfontinst/apps/CMakeLists.txt +++ b/kcontrol/kfontinst/apps/CMakeLists.txt @@ -23,11 +23,11 @@ target_link_libraries(kfontprint_bin ${X11_X11_LIB} ${KDE4_KDEUI_LIBS} ${FREETYP target_link_libraries(kfontview_bin ${KDE4_KPARTS_LIBS} kfontinstui kfontinst ) install(TARGETS kfontinst_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(TARGETS kfontprint_bin DESTINATION ${LIBEXEC_INSTALL_DIR} ) +install(TARGETS kfontprint_bin DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) install(TARGETS kfontview_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kfontview ) -install(PROGRAMS kfontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install(FILES kfontviewui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kfontview ) +install(PROGRAMS kfontview.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) install(FILES installfont.desktop DESTINATION -${SERVICES_INSTALL_DIR}/ServiceMenus ) +${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/dbus/CMakeLists.txt b/kcontrol/kfontinst/dbus/CMakeLists.txt index 60f17ab6..0c14d86a 100644 --- a/kcontrol/kfontinst/dbus/CMakeLists.txt +++ b/kcontrol/kfontinst/dbus/CMakeLists.txt @@ -21,11 +21,11 @@ set_target_properties(fontinst_helper PROPERTIES OUTPUT_NAME fontinst_helper) target_link_libraries(fontinst_helper ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${FONTCONFIG_LIBRARIES} kfontinst) -install(TARGETS fontinst_bin DESTINATION ${LIBEXEC_INSTALL_DIR} ) -install(TARGETS fontinst_helper DESTINATION ${LIBEXEC_INSTALL_DIR} ) -install(PROGRAMS fontinst_x11 DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS fontinst_bin DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) +install(TARGETS fontinst_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) +install(PROGRAMS fontinst_x11 DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) configure_file(org.kde.fontinst.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR} ) kde4_install_auth_helper_files(fontinst_helper org.kde.fontinst root) diff --git a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt index de9f52a7..dfb2cdce 100644 --- a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt @@ -11,8 +11,8 @@ kde4_add_plugin(kcm_fontinst ${kcm_fontinst_PART_SRCS}) target_link_libraries(kcm_fontinst ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} kfontinstui kfontinst ${X11_LIBRARIES}) -install(TARGETS kcm_fontinst DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES fontinst.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kfontinst.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install(TARGETS kcm_fontinst DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES fontinst.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES kfontinst.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) -kde4_install_icons( ${DATA_INSTALL_DIR}/kfontinst/icons ) +kde4_install_icons( ${KDE4_DATA_INSTALL_DIR}/kfontinst/icons ) diff --git a/kcontrol/kfontinst/kio/CMakeLists.txt b/kcontrol/kfontinst/kio/CMakeLists.txt index 29bcdb52..abd01eb9 100644 --- a/kcontrol/kfontinst/kio/CMakeLists.txt +++ b/kcontrol/kfontinst/kio/CMakeLists.txt @@ -6,7 +6,7 @@ set(kio_fonts_PART_SRCS FontInstInterface.cpp KioFonts.cpp ${libkfontinstdbusifa # qt4_add_dbus_interface(kio_fonts_PART_SRCS ../dbus/org.kde.fontinst.xml FontinstIface) kde4_add_plugin(kio_fonts ${kio_fonts_PART_SRCS} ${KFI_FONTINST_AUTH_SRC} ) target_link_libraries(kio_fonts ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} kfontinst ) -install(TARGETS kio_fonts DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES fonts.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services ) -install( FILES fonts.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +install(TARGETS kio_fonts DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES fonts.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services ) +install( FILES fonts.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt index 59fab1ea..6df74080 100644 --- a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt +++ b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(font set_target_properties(font PROPERTIES PREFIX strigita_) -install(TARGETS font LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi) +install(TARGETS font LIBRARY DESTINATION ${KDE4_LIB_INSTALL_DIR}/strigi) diff --git a/kcontrol/kfontinst/thumbnail/CMakeLists.txt b/kcontrol/kfontinst/thumbnail/CMakeLists.txt index 472752e5..f8ab07a6 100644 --- a/kcontrol/kfontinst/thumbnail/CMakeLists.txt +++ b/kcontrol/kfontinst/thumbnail/CMakeLists.txt @@ -9,6 +9,6 @@ kde4_add_plugin(fontthumbnail ${fontthumbnail_PART_SRCS}) target_link_libraries(fontthumbnail ${KDE4_KIO_LIBS} kfontinstui kfontinst ) -install(TARGETS fontthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS fontthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES fontthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/kfontinst/viewpart/CMakeLists.txt index 6f06b8e2..f7ff98a6 100644 --- a/kcontrol/kfontinst/viewpart/CMakeLists.txt +++ b/kcontrol/kfontinst/viewpart/CMakeLists.txt @@ -10,7 +10,7 @@ kde4_add_plugin(kfontviewpart ${kfontviewpart_PART_SRCS}) target_link_libraries(kfontviewpart ${KDE4_KPARTS_LIBS} ${FONTCONFIG_LIBRARIES} kfontinstui kfontinst ) -install(TARGETS kfontviewpart DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES kfontviewpart.rc DESTINATION ${DATA_INSTALL_DIR}/kfontinst ) -install( FILES kfontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kfontviewpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES kfontviewpart.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kfontinst ) +install( FILES kfontviewpart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/knotify/CMakeLists.txt b/kcontrol/knotify/CMakeLists.txt index c383683e..d442bfdb 100644 --- a/kcontrol/knotify/CMakeLists.txt +++ b/kcontrol/knotify/CMakeLists.txt @@ -7,11 +7,11 @@ kde4_add_plugin(kcm_knotify ${kcm_knotify_PART_SRCS}) target_link_libraries(kcm_knotify ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY}) -install(TARGETS kcm_knotify DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_knotify DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES kcmnotify.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kcmnotify.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kcontrol/krdb/ad/CMakeLists.txt b/kcontrol/krdb/ad/CMakeLists.txt index 4ef807e0..383eb903 100644 --- a/kcontrol/krdb/ad/CMakeLists.txt +++ b/kcontrol/krdb/ad/CMakeLists.txt @@ -1,3 +1,3 @@ -install( FILES AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad DESTINATION ${DATA_INSTALL_DIR}/kdisplay/app-defaults ) -install(PROGRAMS krdb DESTINATION ${BIN_INSTALL_DIR}) +install( FILES AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdisplay/app-defaults ) +install(PROGRAMS krdb DESTINATION ${KDE4_BIN_INSTALL_DIR}) diff --git a/kcontrol/krdb/pics/CMakeLists.txt b/kcontrol/krdb/pics/CMakeLists.txt index 5e4ee5a8..11ca5e87 100644 --- a/kcontrol/krdb/pics/CMakeLists.txt +++ b/kcontrol/krdb/pics/CMakeLists.txt @@ -1,2 +1,2 @@ -install( FILES logo.png mini-world.png DESTINATION ${DATA_INSTALL_DIR}/kcontrol/pics ) +install( FILES logo.png mini-world.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcontrol/pics ) diff --git a/kcontrol/krdb/themes/HighContrastDark-big/CMakeLists.txt b/kcontrol/krdb/themes/HighContrastDark-big/CMakeLists.txt index 9208b174..08bc713a 100644 --- a/kcontrol/krdb/themes/HighContrastDark-big/CMakeLists.txt +++ b/kcontrol/krdb/themes/HighContrastDark-big/CMakeLists.txt @@ -1 +1 @@ -install( FILES HighContrastDark-big.preview.png HighContrastDark-big.xml DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/HighContrastDark-big ) +install( FILES HighContrastDark-big.preview.png HighContrastDark-big.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/HighContrastDark-big ) diff --git a/kcontrol/krdb/themes/HighContrastDark/CMakeLists.txt b/kcontrol/krdb/themes/HighContrastDark/CMakeLists.txt index 6f891c3d..f326c08c 100644 --- a/kcontrol/krdb/themes/HighContrastDark/CMakeLists.txt +++ b/kcontrol/krdb/themes/HighContrastDark/CMakeLists.txt @@ -1 +1 @@ -install( FILES HighContrastDark.preview.png HighContrastDark.xml DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/HighContrastDark ) +install( FILES HighContrastDark.preview.png HighContrastDark.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/HighContrastDark ) diff --git a/kcontrol/krdb/themes/HighContrastLight-big/CMakeLists.txt b/kcontrol/krdb/themes/HighContrastLight-big/CMakeLists.txt index 586550d6..294db09d 100644 --- a/kcontrol/krdb/themes/HighContrastLight-big/CMakeLists.txt +++ b/kcontrol/krdb/themes/HighContrastLight-big/CMakeLists.txt @@ -1,2 +1,2 @@ -install( FILES HighContrastLight-big.preview.png HighContrastLight-big.xml DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/HighContrastLight-big ) +install( FILES HighContrastLight-big.preview.png HighContrastLight-big.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/HighContrastLight-big ) diff --git a/kcontrol/krdb/themes/HighContrastLight/CMakeLists.txt b/kcontrol/krdb/themes/HighContrastLight/CMakeLists.txt index 1ef9b288..27b5f47b 100644 --- a/kcontrol/krdb/themes/HighContrastLight/CMakeLists.txt +++ b/kcontrol/krdb/themes/HighContrastLight/CMakeLists.txt @@ -1,2 +1,2 @@ -install( FILES HighContrastLight.preview.png HighContrastLight.xml DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/HighContrastLight ) +install( FILES HighContrastLight.preview.png HighContrastLight.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/HighContrastLight ) diff --git a/kcontrol/krdb/themes/KDE_Classic/CMakeLists.txt b/kcontrol/krdb/themes/KDE_Classic/CMakeLists.txt index 5b08a839..61353bf2 100644 --- a/kcontrol/krdb/themes/KDE_Classic/CMakeLists.txt +++ b/kcontrol/krdb/themes/KDE_Classic/CMakeLists.txt @@ -1 +1 @@ -install( FILES KDE_Classic.xml KDE_Classic.preview.png DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/KDE_Classic ) +install( FILES KDE_Classic.xml KDE_Classic.preview.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/KDE_Classic ) diff --git a/kcontrol/krdb/themes/Keramik/CMakeLists.txt b/kcontrol/krdb/themes/Keramik/CMakeLists.txt index 8b510af4..b51d1670 100644 --- a/kcontrol/krdb/themes/Keramik/CMakeLists.txt +++ b/kcontrol/krdb/themes/Keramik/CMakeLists.txt @@ -1,2 +1,2 @@ -install( FILES Keramik.xml Keramik.preview.png DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/Keramik ) +install( FILES Keramik.xml Keramik.preview.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/Keramik ) diff --git a/kcontrol/krdb/themes/Plastik/CMakeLists.txt b/kcontrol/krdb/themes/Plastik/CMakeLists.txt index c83d6d03..0c33e011 100644 --- a/kcontrol/krdb/themes/Plastik/CMakeLists.txt +++ b/kcontrol/krdb/themes/Plastik/CMakeLists.txt @@ -1 +1 @@ -install( FILES Plastik.xml Plastik.preview.png DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/Plastik ) +install( FILES Plastik.xml Plastik.preview.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/Plastik ) diff --git a/kcontrol/krdb/themes/Platinum/CMakeLists.txt b/kcontrol/krdb/themes/Platinum/CMakeLists.txt index f4b341c1..a19276f3 100644 --- a/kcontrol/krdb/themes/Platinum/CMakeLists.txt +++ b/kcontrol/krdb/themes/Platinum/CMakeLists.txt @@ -1 +1 @@ -install( FILES Platinum.xml Platinum.preview.png DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/Platinum ) +install( FILES Platinum.xml Platinum.preview.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/Platinum ) diff --git a/kcontrol/krdb/themes/Redmond/CMakeLists.txt b/kcontrol/krdb/themes/Redmond/CMakeLists.txt index 5258635b..5fc4c1ef 100644 --- a/kcontrol/krdb/themes/Redmond/CMakeLists.txt +++ b/kcontrol/krdb/themes/Redmond/CMakeLists.txt @@ -1 +1 @@ -install( FILES Redmond.xml Redmond.preview.png DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/Redmond ) +install( FILES Redmond.xml Redmond.preview.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/Redmond ) diff --git a/kcontrol/krdb/themes/Sunshine/CMakeLists.txt b/kcontrol/krdb/themes/Sunshine/CMakeLists.txt index 283a9e75..3631ccd3 100644 --- a/kcontrol/krdb/themes/Sunshine/CMakeLists.txt +++ b/kcontrol/krdb/themes/Sunshine/CMakeLists.txt @@ -1 +1 @@ -install( FILES Sunshine.xml Sunshine.preview.png DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/Sunshine ) +install( FILES Sunshine.xml Sunshine.preview.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/Sunshine ) diff --git a/kcontrol/krdb/themes/YellowOnBlue-big/CMakeLists.txt b/kcontrol/krdb/themes/YellowOnBlue-big/CMakeLists.txt index 3d1f0caf..6d5ce12e 100644 --- a/kcontrol/krdb/themes/YellowOnBlue-big/CMakeLists.txt +++ b/kcontrol/krdb/themes/YellowOnBlue-big/CMakeLists.txt @@ -1 +1 @@ -install( FILES YellowOnBlue-big.preview.png YellowOnBlue-big.xml DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/YellowOnBlue-big ) +install( FILES YellowOnBlue-big.preview.png YellowOnBlue-big.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/YellowOnBlue-big ) diff --git a/kcontrol/krdb/themes/YellowOnBlue/CMakeLists.txt b/kcontrol/krdb/themes/YellowOnBlue/CMakeLists.txt index 12b2dc8e..59c6e220 100644 --- a/kcontrol/krdb/themes/YellowOnBlue/CMakeLists.txt +++ b/kcontrol/krdb/themes/YellowOnBlue/CMakeLists.txt @@ -1 +1 @@ -install( FILES YellowOnBlue.preview.png YellowOnBlue.xml DESTINATION ${DATA_INSTALL_DIR}/kthememanager/themes/YellowOnBlue ) +install( FILES YellowOnBlue.preview.png YellowOnBlue.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kthememanager/themes/YellowOnBlue ) diff --git a/kcontrol/launch/CMakeLists.txt b/kcontrol/launch/CMakeLists.txt index 462448c8..421e66ff 100644 --- a/kcontrol/launch/CMakeLists.txt +++ b/kcontrol/launch/CMakeLists.txt @@ -18,10 +18,10 @@ kde4_add_plugin(kcm_launch ${kcm_launch_PART_SRCS}) target_link_libraries(kcm_launch ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) -install(TARGETS kcm_launch DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_launch DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kcmlaunch.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kcmlaunch.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt index 422d5d18..5c789879 100644 --- a/kcontrol/locale/CMakeLists.txt +++ b/kcontrol/locale/CMakeLists.txt @@ -9,9 +9,9 @@ kde4_add_plugin(kcm_locale ${kcm_locale_PART_SRCS}) target_link_libraries(kcm_locale ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ) -install(TARGETS kcm_locale DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_locale DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES language.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES language.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/locale/pics/CMakeLists.txt b/kcontrol/locale/pics/CMakeLists.txt index aabb9f20..265d8328 100644 --- a/kcontrol/locale/pics/CMakeLists.txt +++ b/kcontrol/locale/pics/CMakeLists.txt @@ -3,4 +3,4 @@ ########### install files ############### -install( FILES background.png DESTINATION ${DATA_INSTALL_DIR}/kcmlocale/pics ) +install( FILES background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmlocale/pics ) diff --git a/kcontrol/menus/CMakeLists.txt b/kcontrol/menus/CMakeLists.txt index 61bf4606..2b8aff26 100644 --- a/kcontrol/menus/CMakeLists.txt +++ b/kcontrol/menus/CMakeLists.txt @@ -2,6 +2,6 @@ ########### install files ############### -install( FILES kde-information.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/) +install( FILES kde-information.menu DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/xdg/menus/) -install( FILES kde-information.directory DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} ) +install( FILES kde-information.directory DESTINATION ${KDE4_XDG_DIRECTORY_INSTALL_DIR} ) diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 3512bd7f..5f3f4b98 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -37,7 +37,7 @@ kde4_add_plugin(kcm_randr ${kcm_randr_PART_SRCS}) target_link_libraries(kcm_randr ${KDE4_KDEUI_LIBS} ${X11_Xrandr_LIB} ${X11_LIBRARIES}) -install(TARGETS kcm_randr DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_randr DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -58,7 +58,7 @@ install(TARGETS krandrtray ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### -install(PROGRAMS krandrstartup DESTINATION ${BIN_INSTALL_DIR}) +install(PROGRAMS krandrstartup DESTINATION ${KDE4_BIN_INSTALL_DIR}) -install(FILES randr.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(PROGRAMS krandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES randr.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(PROGRAMS krandrtray.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) diff --git a/kcontrol/randr/module/CMakeLists.txt b/kcontrol/randr/module/CMakeLists.txt index 326fa773..fad61fc3 100644 --- a/kcontrol/randr/module/CMakeLists.txt +++ b/kcontrol/randr/module/CMakeLists.txt @@ -18,8 +18,8 @@ kde4_add_plugin(kded_randrmonitor ${kded_randrmonitor_PART_SRCS}) target_link_libraries(kded_randrmonitor ${KDE4_KDEUI_LIBS} ${X11_Xrandr_LIB} ${X11_LIBRARIES} ${KDE4_SOLID_LIBS}) -install(TARGETS kded_randrmonitor DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kded_randrmonitor DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES randrmonitor.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( FILES randrmonitor.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) diff --git a/kcontrol/screensaver/CMakeLists.txt b/kcontrol/screensaver/CMakeLists.txt index e8a083a8..0235d783 100644 --- a/kcontrol/screensaver/CMakeLists.txt +++ b/kcontrol/screensaver/CMakeLists.txt @@ -19,10 +19,10 @@ if (DL_LIBRARY) target_link_libraries(kcm_screensaver ${DL_LIBRARY}) endif(DL_LIBRARY) -install(TARGETS kcm_screensaver DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_screensaver DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES screensaver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES screensaver.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/smartcard/CMakeLists.txt b/kcontrol/smartcard/CMakeLists.txt index 75cd6ae1..35646ccd 100644 --- a/kcontrol/smartcard/CMakeLists.txt +++ b/kcontrol/smartcard/CMakeLists.txt @@ -9,12 +9,12 @@ kde4_add_plugin(kcm_smartcard ${kcm_smartcard_PART_SRCS}) target_link_libraries(kcm_smartcard ksmartcard ${KDE4_KIO_LIBS} ) -install(TARGETS kcm_smartcard DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_smartcard DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES smartcard.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES smartcard.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/spellchecking/CMakeLists.txt b/kcontrol/spellchecking/CMakeLists.txt index 5ceea2bb..6f4e4f72 100644 --- a/kcontrol/spellchecking/CMakeLists.txt +++ b/kcontrol/spellchecking/CMakeLists.txt @@ -9,5 +9,5 @@ KDE4_ADD_PLUGIN(kcmspellchecking ${kcm_spellchecking_SRCS}) TARGET_LINK_LIBRARIES(kcmspellchecking ${KDE4_KDEUI_LIBS} ) -INSTALL(TARGETS kcmspellchecking DESTINATION ${PLUGIN_INSTALL_DIR} ) -INSTALL( FILES spellchecking.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +INSTALL(TARGETS kcmspellchecking DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +INSTALL( FILES spellchecking.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/splash/CMakeLists.txt b/kcontrol/splash/CMakeLists.txt index 30f47513..dcfb94a0 100644 --- a/kcontrol/splash/CMakeLists.txt +++ b/kcontrol/splash/CMakeLists.txt @@ -7,9 +7,9 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ set(kcm_ksplashthemes_PART_SRCS installer.cpp main.cpp ) kde4_add_plugin(kcm_ksplashthemes ${kcm_ksplashthemes_PART_SRCS}) target_link_libraries(kcm_ksplashthemes ${KDE4_KIO_LIBS}) -install(TARGETS kcm_ksplashthemes DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_ksplashthemes DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES ksplashthememgr.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES ksplash.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES ksplashthememgr.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES ksplash.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) diff --git a/kcontrol/splash/pics/CMakeLists.txt b/kcontrol/splash/pics/CMakeLists.txt index 9bb70750..bd4b9119 100644 --- a/kcontrol/splash/pics/CMakeLists.txt +++ b/kcontrol/splash/pics/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kcontrol/standard_actions/CMakeLists.txt b/kcontrol/standard_actions/CMakeLists.txt index 166ebaea..d29eadce 100644 --- a/kcontrol/standard_actions/CMakeLists.txt +++ b/kcontrol/standard_actions/CMakeLists.txt @@ -4,6 +4,6 @@ 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}) -install(TARGETS kcm_standard_actions DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES standard_actions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 bbd9e70d..31606577 100644 --- a/kcontrol/style/CMakeLists.txt +++ b/kcontrol/style/CMakeLists.txt @@ -21,10 +21,10 @@ target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS}) target_link_libraries(kcm_style kdecorations) -install(TARGETS kcm_style DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_style DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES kcmstyle.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kcmstyle ) -install( FILES style.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kcmstyle.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmstyle ) +install( FILES style.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kcontrol/workspaceoptions/CMakeLists.txt b/kcontrol/workspaceoptions/CMakeLists.txt index 3de239ed..00b30010 100644 --- a/kcontrol/workspaceoptions/CMakeLists.txt +++ b/kcontrol/workspaceoptions/CMakeLists.txt @@ -6,8 +6,8 @@ kde4_add_plugin(kcm_workspaceoptions ${kcm_workspaceoptions_PART_SRCS}) target_link_libraries(kcm_workspaceoptions ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ) -install(TARGETS kcm_workspaceoptions DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_workspaceoptions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES workspaceoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES workspaceoptions.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeeject/CMakeLists.txt b/kdeeject/CMakeLists.txt index 038978cd..e6168c7d 100644 --- a/kdeeject/CMakeLists.txt +++ b/kdeeject/CMakeLists.txt @@ -1,4 +1,4 @@ install( PROGRAMS kdeeject - DESTINATION ${LIBEXEC_INSTALL_DIR} + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) diff --git a/kdm/CMakeLists.txt b/kdm/CMakeLists.txt index c8560296..6e85fd85 100644 --- a/kdm/CMakeLists.txt +++ b/kdm/CMakeLists.txt @@ -4,7 +4,7 @@ install_pam_service(KDM) include(ConfigureChecks.cmake) -install( FILES README DESTINATION ${DATA_INSTALL_DIR}/doc/kdm ) +install( FILES README DESTINATION ${KDE4_DATA_INSTALL_DIR}/doc/kdm ) set(confproc ${CMAKE_CURRENT_SOURCE_DIR}/confproc.pl) set(confdef ${CMAKE_CURRENT_SOURCE_DIR}/config.def) diff --git a/kdm/ConfigureChecks.cmake b/kdm/ConfigureChecks.cmake index 22978f38..19a60eae 100644 --- a/kdm/ConfigureChecks.cmake +++ b/kdm/ConfigureChecks.cmake @@ -231,32 +231,32 @@ else (dont_add_xbin) endif (dont_add_xbin) set(KDM_LIBEXEC_STRIP 0) -if (NOT LIBEXEC_INSTALL_DIR STREQUAL "${BIN_INSTALL_DIR}") - STRING(LENGTH "${BIN_INSTALL_DIR}" bidl) - STRING(LENGTH "${LIBEXEC_INSTALL_DIR}" lxidl) +if (NOT LIBEXEC_INSTALL_DIR STREQUAL "${KDE4_BIN_INSTALL_DIR}") + STRING(LENGTH "${KDE4_BIN_INSTALL_DIR}" bidl) + STRING(LENGTH "${KDE4_LIBEXEC_INSTALL_DIR}" lxidl) set(ips "${CMAKE_INSTALL_PREFIX}/") STRING(LENGTH "${ips}" ipsl) set(inip 1) if (bidl LESS ${ipsl} OR lxidl LESS ${ipsl}) set(inip) else (bidl LESS ${ipsl} OR lxidl LESS ${ipsl}) - STRING(SUBSTRING "${BIN_INSTALL_DIR}" 0 ${ipsl} bpr) - STRING(SUBSTRING "${LIBEXEC_INSTALL_DIR}" 0 ${ipsl} lpr) + STRING(SUBSTRING "${KDE4_BIN_INSTALL_DIR}" 0 ${ipsl} bpr) + STRING(SUBSTRING "${KDE4_LIBEXEC_INSTALL_DIR}" 0 ${ipsl} lpr) if (NOT bpr STREQUAL "${lpr}") set(inip) endif (NOT bpr STREQUAL "${lpr}") endif (bidl LESS ${ipsl} OR lxidl LESS ${ipsl}) if (NOT inip) set(KDM_LIBEXEC_STRIP -1) - set(KDM_LIBEXEC_SUFFIX "${LIBEXEC_INSTALL_DIR}") + set(KDM_LIBEXEC_SUFFIX "${KDE4_LIBEXEC_INSTALL_DIR}") else (NOT inip) MATH(EXPR bsfxl "${bidl} - ${ipsl}") - STRING(SUBSTRING "${BIN_INSTALL_DIR}" ${ipsl} ${bsfxl} bsfx) + STRING(SUBSTRING "${KDE4_BIN_INSTALL_DIR}" ${ipsl} ${bsfxl} bsfx) STRING(REPLACE "/" ";" bsfxl "${bsfx}") LIST(LENGTH bsfxl KDM_LIBEXEC_STRIP) MATH(EXPR klxsfxl "${lxidl} - ${ipsl}") - STRING(SUBSTRING "${LIBEXEC_INSTALL_DIR}" ${ipsl} ${klxsfxl} KDM_LIBEXEC_SUFFIX) + STRING(SUBSTRING "${KDE4_LIBEXEC_INSTALL_DIR}" ${ipsl} ${klxsfxl} KDM_LIBEXEC_SUFFIX) endif (NOT inip) -endif (NOT LIBEXEC_INSTALL_DIR STREQUAL "${BIN_INSTALL_DIR}") +endif (NOT LIBEXEC_INSTALL_DIR STREQUAL "${KDE4_BIN_INSTALL_DIR}") configure_file(config-kdm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdm.h) diff --git a/kdm/kcm/CMakeLists.txt b/kdm/kcm/CMakeLists.txt index ac568374..43ddcb3b 100644 --- a/kdm/kcm/CMakeLists.txt +++ b/kdm/kcm/CMakeLists.txt @@ -17,18 +17,18 @@ target_link_libraries(kcm_kdm ${KDE4_KIO_LIBS} ${X11_LIBRARIES} kworkspace) macro_add_file_dependencies(kdm-shut.cpp ${confci}) add_dependencies(kcm_kdm ConfigCi) -install(TARGETS kcm_kdm DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kdm DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) #### KAuth helper and actions #### add_executable(kcmkdmhelper helper.cpp) target_link_libraries(kcmkdmhelper ${KDE4_KDECORE_LIBS}) -install(TARGETS kcmkdmhelper DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kcmkdmhelper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) kde4_install_auth_helper_files(kcmkdmhelper org.kde.kcontrol.kcmkdm root) ########### install files ############### -install( FILES kdm.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdm.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -install( FILES anchor.png DESTINATION ${DATA_INSTALL_DIR}/kcontrol/pics ) -install( FILES kdm.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES anchor.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcontrol/pics ) +install( FILES kdm.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) diff --git a/kdm/kfrontend/CMakeLists.txt b/kdm/kfrontend/CMakeLists.txt index 08d5dbcd..4b478716 100644 --- a/kdm/kfrontend/CMakeLists.txt +++ b/kdm/kfrontend/CMakeLists.txt @@ -76,7 +76,7 @@ if (WITH_KDM_XCONSOLE) target_link_libraries(kdm_greet ${KDE4_KPTY_LIBS}) endif (WITH_KDM_XCONSOLE) -install(TARGETS kdm_greet DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kdm_greet DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) set(kdm_config_SRCS kdm_config.c) macro_add_file_dependencies(kdm_config.c ${confci}) @@ -84,7 +84,7 @@ add_executable(kdm_config ${kdm_config_SRCS}) set_target_properties(kdm_config PROPERTIES COMPILE_FLAGS -U_REENTRANT) target_link_libraries(kdm_config ${SOCKET_LIBRARIES} ${RESOLV_LIBRARIES} ${POSIX4_LIBRARIES}) add_dependencies(kdm_config ConfigCi) -install(TARGETS kdm_config DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kdm_config DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) set(genkdmconf_SRCS genkdmconf.c) macro_add_file_dependencies(genkdmconf.c ${confci}) @@ -105,5 +105,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS_DEFAULT_ARGS}) # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h) install(CODE " -exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) +exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${KDE4_CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) ") diff --git a/kdm/kfrontend/pics/CMakeLists.txt b/kdm/kfrontend/pics/CMakeLists.txt index 0b99443c..09f09d4b 100644 --- a/kdm/kfrontend/pics/CMakeLists.txt +++ b/kdm/kfrontend/pics/CMakeLists.txt @@ -1,5 +1,5 @@ -install( FILES kdelogo.png shutdown.png DESTINATION ${DATA_INSTALL_DIR}/kdm/pics ) -install( FILES default1.png default2.png default3.png root1.png DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users ) -install( FILES stripes.png stripes.png.desktop DESTINATION ${WALLPAPER_INSTALL_DIR} ) +install( FILES kdelogo.png shutdown.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdm/pics ) +install( FILES default1.png default2.png default3.png root1.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdm/pics/users ) +install( FILES stripes.png stripes.png.desktop DESTINATION ${KDE4_WALLPAPER_INSTALL_DIR} ) diff --git a/kdm/kfrontend/sessions/CMakeLists.txt b/kdm/kfrontend/sessions/CMakeLists.txt index 9cb92491..83a89715 100644 --- a/kdm/kfrontend/sessions/CMakeLists.txt +++ b/kdm/kfrontend/sessions/CMakeLists.txt @@ -51,5 +51,5 @@ install(FILES xfce.desktop xfce4.desktop - DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdm/sessions ) diff --git a/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake b/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake index 7ca5ec15..fd46beb1 100644 --- a/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake +++ b/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=XSession -Exec=${BIN_INSTALL_DIR}/startkde --failsafe -TryExec=${BIN_INSTALL_DIR}/startkde +Exec=${KDE4_BIN_INSTALL_DIR}/startkde --failsafe +TryExec=${KDE4_BIN_INSTALL_DIR}/startkde DesktopNames=KDE Name=KDE Plasma Workspace (failsafe session) Name[ar]=مساحة عمل بلازما كدي (الجلسة الآمنة) diff --git a/kdm/kfrontend/sessions/kde-plasma.desktop.cmake b/kdm/kfrontend/sessions/kde-plasma.desktop.cmake index 7fd9f6f2..ff8b8481 100644 --- a/kdm/kfrontend/sessions/kde-plasma.desktop.cmake +++ b/kdm/kfrontend/sessions/kde-plasma.desktop.cmake @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=XSession -Exec=${BIN_INSTALL_DIR}/startkde -TryExec=${BIN_INSTALL_DIR}/startkde +Exec=${KDE4_BIN_INSTALL_DIR}/startkde +TryExec=${KDE4_BIN_INSTALL_DIR}/startkde DesktopNames=KDE Name=KDE Plasma Workspace Name[ar]=مساحة عمل بلازما كدي diff --git a/kdm/kfrontend/themes/CMakeLists.txt b/kdm/kfrontend/themes/CMakeLists.txt index b60364d5..fb518a00 100644 --- a/kdm/kfrontend/themes/CMakeLists.txt +++ b/kdm/kfrontend/themes/CMakeLists.txt @@ -2,4 +2,4 @@ add_subdirectory( ariya ) add_subdirectory( auros ) add_subdirectory( elarun ) -install( FILES greeter.dtd DESTINATION ${DATA_INSTALL_DIR}/doc/kdm ) +install( FILES greeter.dtd DESTINATION ${KDE4_DATA_INSTALL_DIR}/doc/kdm ) diff --git a/kdm/kfrontend/themes/ariya/CMakeLists.txt b/kdm/kfrontend/themes/ariya/CMakeLists.txt index d4104eb5..430c6e65 100644 --- a/kdm/kfrontend/themes/ariya/CMakeLists.txt +++ b/kdm/kfrontend/themes/ariya/CMakeLists.txt @@ -13,4 +13,4 @@ install(FILES session_normal.png system_normal.png user_icon.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/ariya) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdm/themes/ariya) diff --git a/kdm/kfrontend/themes/auros/CMakeLists.txt b/kdm/kfrontend/themes/auros/CMakeLists.txt index 643468a1..522163aa 100644 --- a/kdm/kfrontend/themes/auros/CMakeLists.txt +++ b/kdm/kfrontend/themes/auros/CMakeLists.txt @@ -8,4 +8,4 @@ install(FILES auros.svg branding-icon.png screenshot.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/auros) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdm/themes/auros) diff --git a/kdm/kfrontend/themes/elarun/CMakeLists.txt b/kdm/kfrontend/themes/elarun/CMakeLists.txt index 6b11dfc4..a05c6610 100644 --- a/kdm/kfrontend/themes/elarun/CMakeLists.txt +++ b/kdm/kfrontend/themes/elarun/CMakeLists.txt @@ -13,4 +13,4 @@ install(FILES session_normal.png system_normal.png user_icon.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/elarun) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdm/themes/elarun) diff --git a/kdontchangethehostname/CMakeLists.txt b/kdontchangethehostname/CMakeLists.txt index 78c6181e..27841e92 100644 --- a/kdontchangethehostname/CMakeLists.txt +++ b/kdontchangethehostname/CMakeLists.txt @@ -1,5 +1,5 @@ set(kdontchangethehostname_SRCS khostname.cpp ) add_executable(kdontchangethehostname ${kdontchangethehostname_SRCS}) target_link_libraries(kdontchangethehostname ${KDE4_KDECORE_LIBS}) -install(TARGETS kdontchangethehostname DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kdontchangethehostname DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/keditfiletype/CMakeLists.txt b/keditfiletype/CMakeLists.txt index edad51b8..8305aba2 100644 --- a/keditfiletype/CMakeLists.txt +++ b/keditfiletype/CMakeLists.txt @@ -22,7 +22,7 @@ kde4_add_plugin(kcm_filetypes ${kcm_filetypes_SRCS}) target_link_libraries(kcm_filetypes ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_filetypes DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_filetypes DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### @@ -39,4 +39,4 @@ install(TARGETS keditfiletype ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( FILES filetypes.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES filetypes.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt index 76abb26c..37a56552 100644 --- a/kglobalaccel/CMakeLists.txt +++ b/kglobalaccel/CMakeLists.txt @@ -29,8 +29,8 @@ target_link_libraries(kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIB # Install application and configuration install( TARGETS kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} ) -# install( FILES kglobalaccel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -install( FILES kglobalaccel.desktop DESTINATION ${SERVICES_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 ${DATA_INSTALL_DIR}/kglobalaccel) +install( FILES kglobalaccel.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kglobalaccel) diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt index 0e6df382..d882909d 100644 --- a/khotkeys/app/CMakeLists.txt +++ b/khotkeys/app/CMakeLists.txt @@ -17,11 +17,11 @@ endif(X11_XTest_FOUND) ########### install files ############### -install(TARGETS kded_khotkeys DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_khotkeys DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES khotkeys.desktop DESTINATION ${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 ${DBUS_INTERFACES_INSTALL_DIR}) + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) diff --git a/khotkeys/data/CMakeLists.txt b/khotkeys/data/CMakeLists.txt index 88c088c0..0ea0ce18 100644 --- a/khotkeys/data/CMakeLists.txt +++ b/khotkeys/data/CMakeLists.txt @@ -2,5 +2,5 @@ install( FILES defaults.khotkeys printscreen.khotkeys - DESTINATION ${DATA_INSTALL_DIR}/khotkeys + DESTINATION ${KDE4_DATA_INSTALL_DIR}/khotkeys ) diff --git a/khotkeys/kcm_hotkeys/CMakeLists.txt b/khotkeys/kcm_hotkeys/CMakeLists.txt index 6f8653a7..211d183d 100644 --- a/khotkeys/kcm_hotkeys/CMakeLists.txt +++ b/khotkeys/kcm_hotkeys/CMakeLists.txt @@ -92,10 +92,10 @@ target_link_libraries( install( TARGETS kcm_hotkeys - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES khotkeys.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/CMakeLists.txt b/kinfocenter/CMakeLists.txt index 857bf137..eac11c28 100644 --- a/kinfocenter/CMakeLists.txt +++ b/kinfocenter/CMakeLists.txt @@ -29,5 +29,5 @@ target_link_libraries( kinfocenter ${KDE4_KFILE_LIBS} ${KDE4_KCMUTILS_LIBS} ) ##install install( TARGETS kinfocenter ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( PROGRAMS kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -INSTALL( FILES kinfocenterui.rc DESTINATION ${DATA_INSTALL_DIR}/kinfocenter ) +install( PROGRAMS kinfocenter.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) +INSTALL( FILES kinfocenterui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kinfocenter ) diff --git a/kinfocenter/Categories/CMakeLists.txt b/kinfocenter/Categories/CMakeLists.txt index 4641094d..c445443d 100644 --- a/kinfocenter/Categories/CMakeLists.txt +++ b/kinfocenter/Categories/CMakeLists.txt @@ -1,5 +1,5 @@ -install( FILES kinfocentercategory.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES kinfocentercategory.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) install( FILES deviceinfocategory.desktop graphicalinfocategory.desktop networkinfocategory.desktop lostfoundcategory.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/devinfo/CMakeLists.txt b/kinfocenter/Modules/devinfo/CMakeLists.txt index d0af4fa5..14703f99 100644 --- a/kinfocenter/Modules/devinfo/CMakeLists.txt +++ b/kinfocenter/Modules/devinfo/CMakeLists.txt @@ -5,5 +5,5 @@ set( devinfoSources soldevice.cpp devinfo.cpp devicelisting.cpp infopanel.cpp so kde4_add_plugin( devinfo ${devinfoSources} ) target_link_libraries( devinfo ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) -install( TARGETS devinfo DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES devinfo.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 dba6bc7b..10936f37 100644 --- a/kinfocenter/Modules/info/CMakeLists.txt +++ b/kinfocenter/Modules/info/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS}) target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB}) -install(TARGETS kcm_info DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_info DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### @@ -26,6 +26,6 @@ install( ioports.desktop scsi.desktop xserver.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/infosummary/CMakeLists.txt b/kinfocenter/Modules/infosummary/CMakeLists.txt index 5352b6dc..fc87b898 100644 --- a/kinfocenter/Modules/infosummary/CMakeLists.txt +++ b/kinfocenter/Modules/infosummary/CMakeLists.txt @@ -4,5 +4,5 @@ set( infosummarySources infosum.cpp defaultboxwidget.cpp progressboxwidget.cpp o kde4_add_plugin( kcm_infosummary ${infosummarySources} ) target_link_libraries( kcm_infosummary ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ) -install( TARGETS kcm_infosummary DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES kcm_infosummary.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS kcm_infosummary DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES kcm_infosummary.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/memory/CMakeLists.txt b/kinfocenter/Modules/memory/CMakeLists.txt index 573f43f5..551ab7bc 100644 --- a/kinfocenter/Modules/memory/CMakeLists.txt +++ b/kinfocenter/Modules/memory/CMakeLists.txt @@ -11,8 +11,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") target_link_libraries(kcm_memory kvm) endif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") -install(TARGETS kcm_memory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_memory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES kcm_memory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install( FILES kcm_memory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kinfocenter/Modules/nics/CMakeLists.txt b/kinfocenter/Modules/nics/CMakeLists.txt index defa6202..52be0bd7 100644 --- a/kinfocenter/Modules/nics/CMakeLists.txt +++ b/kinfocenter/Modules/nics/CMakeLists.txt @@ -20,10 +20,10 @@ kde4_add_plugin(kcm_nic ${kcm_nic_PART_SRCS}) target_link_libraries(kcm_nic ${KDE4_KIO_LIBS} ) -install(TARGETS kcm_nic DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_nic DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES nic.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES nic.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/opengl/CMakeLists.txt b/kinfocenter/Modules/opengl/CMakeLists.txt index 01915112..3a2f7918 100644 --- a/kinfocenter/Modules/opengl/CMakeLists.txt +++ b/kinfocenter/Modules/opengl/CMakeLists.txt @@ -28,8 +28,8 @@ endif() configure_file(openglconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/openglconfig.h ) -install(TARGETS kcm_opengl DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_opengl DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES opengl.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES opengl.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kinfocenter/Modules/pci/CMakeLists.txt b/kinfocenter/Modules/pci/CMakeLists.txt index dc20552c..c0743ac8 100644 --- a/kinfocenter/Modules/pci/CMakeLists.txt +++ b/kinfocenter/Modules/pci/CMakeLists.txt @@ -32,8 +32,8 @@ else(PCIUTILS_FOUND) target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} ) endif(PCIUTILS_FOUND) -install(TARGETS kcm_pci DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_pci DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES kcm_pci.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install( FILES kcm_pci.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kinfocenter/Modules/samba/CMakeLists.txt b/kinfocenter/Modules/samba/CMakeLists.txt index 6f518f4d..6c0422c5 100644 --- a/kinfocenter/Modules/samba/CMakeLists.txt +++ b/kinfocenter/Modules/samba/CMakeLists.txt @@ -11,9 +11,9 @@ kde4_add_plugin(kcm_samba ${kcm_samba_PART_SRCS}) target_link_libraries(kcm_samba ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_samba DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_samba DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES smbstatus.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES smbstatus.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kinfocenter/Modules/usbview/CMakeLists.txt b/kinfocenter/Modules/usbview/CMakeLists.txt index 87bb2562..b9e3b581 100644 --- a/kinfocenter/Modules/usbview/CMakeLists.txt +++ b/kinfocenter/Modules/usbview/CMakeLists.txt @@ -11,10 +11,10 @@ kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS}) target_link_libraries(kcm_usb ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) -install(TARGETS kcm_usb DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_usb DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kcmusb.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES usb.ids DESTINATION ${DATA_INSTALL_DIR}/kcmusb ) +install( FILES kcmusb.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES usb.ids DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmusb ) diff --git a/kinfocenter/Modules/view1394/CMakeLists.txt b/kinfocenter/Modules/view1394/CMakeLists.txt index e3b21c9e..89894c2c 100644 --- a/kinfocenter/Modules/view1394/CMakeLists.txt +++ b/kinfocenter/Modules/view1394/CMakeLists.txt @@ -6,11 +6,11 @@ kde4_add_plugin(kcm_view1394 ${kcm_view1394_PART_SRCS}) target_link_libraries(kcm_view1394 ${KDE4_KDEUI_LIBS} ${RAW1394_LIBRARIES}) -install(TARGETS kcm_view1394 DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_view1394 DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES kcmview1394.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES oui.db DESTINATION ${DATA_INSTALL_DIR}/kcmview1394) +install(FILES kcmview1394.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES oui.db DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcmview1394) diff --git a/kioexec/CMakeLists.txt b/kioexec/CMakeLists.txt index 387e3e02..79d24ac5 100644 --- a/kioexec/CMakeLists.txt +++ b/kioexec/CMakeLists.txt @@ -4,5 +4,5 @@ add_executable(kioexec ${kioexec_SRCS}) target_link_libraries(kioexec ${KDE4_KIO_LIBS}) -install(TARGETS kioexec DESTINATION ${LIBEXEC_INSTALL_DIR} ) +install(TARGETS kioexec DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) diff --git a/kioslave/about/CMakeLists.txt b/kioslave/about/CMakeLists.txt index 4f8d91f7..c5ea7462 100644 --- a/kioslave/about/CMakeLists.txt +++ b/kioslave/about/CMakeLists.txt @@ -12,9 +12,9 @@ kde4_add_plugin(kio_about ${kio_about_PART_SRCS}) target_link_libraries(kio_about ${KDE4_KIO_LIBS} ) -install(TARGETS kio_about DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_about DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES about.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES about.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/applications/CMakeLists.txt b/kioslave/applications/CMakeLists.txt index 453be34a..a4f71146 100644 --- a/kioslave/applications/CMakeLists.txt +++ b/kioslave/applications/CMakeLists.txt @@ -4,9 +4,9 @@ kde4_add_plugin(kio_applications kio_applications.cpp) target_link_libraries(kio_applications ${KDE4_KIO_LIBS} ) -install(TARGETS kio_applications DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_applications DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES programs.protocol applications.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES programs.protocol applications.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/archive/CMakeLists.txt b/kioslave/archive/CMakeLists.txt index b14153f4..6c542654 100644 --- a/kioslave/archive/CMakeLists.txt +++ b/kioslave/archive/CMakeLists.txt @@ -10,7 +10,7 @@ kde4_add_plugin(kio_archive ${kio_archive_SRCS}) target_link_libraries(kio_archive ${KDE4_KIO_LIBS} ) -install(TARGETS kio_archive DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES tar.protocol ar.protocol zip.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kio_archive DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES tar.protocol ar.protocol zip.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/bookmarks/CMakeLists.txt b/kioslave/bookmarks/CMakeLists.txt index 749d368f..8adf6665 100644 --- a/kioslave/bookmarks/CMakeLists.txt +++ b/kioslave/bookmarks/CMakeLists.txt @@ -6,9 +6,9 @@ kde4_add_plugin(kio_bookmarks ${kio_bookmarks_PART_SRCS}) target_link_libraries(kio_bookmarks ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS kio_bookmarks DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_bookmarks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kio_bookmarks.css DESTINATION ${DATA_INSTALL_DIR}/kio_bookmarks ) -install( FILES bookmarks.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kio_bookmarks.css DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_bookmarks ) +install( FILES bookmarks.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/cgi/CMakeLists.txt b/kioslave/cgi/CMakeLists.txt index 4fadb92e..e9884c5c 100644 --- a/kioslave/cgi/CMakeLists.txt +++ b/kioslave/cgi/CMakeLists.txt @@ -14,10 +14,10 @@ kde4_add_plugin(kio_cgi ${kio_cgi_PART_SRCS}) target_link_libraries(kio_cgi ${KDE4_KIO_LIBS} ) -install(TARGETS kio_cgi DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_cgi DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES cgi.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES cgi.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/cgi/kcmcgi/CMakeLists.txt b/kioslave/cgi/kcmcgi/CMakeLists.txt index 224b9543..b774a9d3 100644 --- a/kioslave/cgi/kcmcgi/CMakeLists.txt +++ b/kioslave/cgi/kcmcgi/CMakeLists.txt @@ -11,10 +11,10 @@ kde4_add_plugin(kcm_cgi ${kcm_cgi_PART_SRCS}) target_link_libraries(kcm_cgi ${KDE4_KIO_LIBS} ) -install(TARGETS kcm_cgi DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_cgi DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kcmcgi.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kcmcgi.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/desktop/CMakeLists.txt b/kioslave/desktop/CMakeLists.txt index 261406e5..7264f898 100644 --- a/kioslave/desktop/CMakeLists.txt +++ b/kioslave/desktop/CMakeLists.txt @@ -10,7 +10,7 @@ kde4_add_plugin(kio_desktop ${kio_desktop_PART_SRCS}) target_link_libraries(kio_desktop ${KDE4_KIO_LIBS}) -install(TARGETS kio_desktop DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_desktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### @@ -20,13 +20,13 @@ kde4_add_plugin(kded_desktopnotifier ${kded_desktopnotifier_PART_SRCS}) target_link_libraries(kded_desktopnotifier ${KDE4_KIO_LIBS}) -install(TARGETS kded_desktopnotifier DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kded_desktopnotifier DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES desktopnotifier.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES desktop.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES desktopnotifier.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) +install( FILES desktop.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -install(FILES directory.desktop directory.trash DESTINATION ${DATA_INSTALL_DIR}/kio_desktop) -install(FILES Home.desktop DESTINATION ${DATA_INSTALL_DIR}/kio_desktop/DesktopLinks) +install(FILES directory.desktop directory.trash DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_desktop) +install(FILES Home.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_desktop/DesktopLinks) diff --git a/kioslave/docfilter/CMakeLists.txt b/kioslave/docfilter/CMakeLists.txt index 7e793040..8dea3642 100644 --- a/kioslave/docfilter/CMakeLists.txt +++ b/kioslave/docfilter/CMakeLists.txt @@ -1,3 +1,3 @@ ########### install files ############### -install( FILES kio_docfilter.css DESTINATION ${DATA_INSTALL_DIR}/kio_docfilter ) +install( FILES kio_docfilter.css DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_docfilter ) diff --git a/kioslave/filter/CMakeLists.txt b/kioslave/filter/CMakeLists.txt index a0200669..da08e441 100644 --- a/kioslave/filter/CMakeLists.txt +++ b/kioslave/filter/CMakeLists.txt @@ -23,16 +23,16 @@ kde4_add_plugin(kio_filter ${kio_filter_PART_SRCS}) target_link_libraries(kio_filter ${KDE4_KIO_LIBS}) -install(TARGETS kio_filter DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kio_filter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES gzip.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES gzip.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) if(BZIP2_FOUND) -install( FILES bzip.protocol bzip2.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES bzip.protocol bzip2.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif(BZIP2_FOUND) if(LIBLZMA_FOUND) -install( FILES lzma.protocol xz.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES lzma.protocol xz.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif(LIBLZMA_FOUND) diff --git a/kioslave/finger/CMakeLists.txt b/kioslave/finger/CMakeLists.txt index 20b02866..303676af 100644 --- a/kioslave/finger/CMakeLists.txt +++ b/kioslave/finger/CMakeLists.txt @@ -12,12 +12,12 @@ kde4_add_plugin(kio_finger ${kio_finger_PART_SRCS}) target_link_libraries(kio_finger ${KDE4_KIO_LIBS} ) -install(TARGETS kio_finger DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_finger DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kio_finger.pl kio_finger.css DESTINATION ${DATA_INSTALL_DIR}/kio_finger ) -install( FILES finger.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kio_finger.pl kio_finger.css DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_finger ) +install( FILES finger.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/fish/CMakeLists.txt b/kioslave/fish/CMakeLists.txt index 907c8c9c..1d12b7d4 100644 --- a/kioslave/fish/CMakeLists.txt +++ b/kioslave/fish/CMakeLists.txt @@ -42,11 +42,11 @@ if (MD5SUM_EXECUTABLE) target_link_libraries(kio_fish ${UTIL_LIBRARIES}) endif (UTIL_LIBRARIES) - install(TARGETS kio_fish DESTINATION ${PLUGIN_INSTALL_DIR} ) + install(TARGETS kio_fish DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### - install( FILES fish.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) + install( FILES fish.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif (MD5SUM_EXECUTABLE) diff --git a/kioslave/floppy/CMakeLists.txt b/kioslave/floppy/CMakeLists.txt index f8228d87..c9f9e958 100644 --- a/kioslave/floppy/CMakeLists.txt +++ b/kioslave/floppy/CMakeLists.txt @@ -12,10 +12,10 @@ kde4_add_plugin(kio_floppy ${kio_floppy_PART_SRCS}) target_link_libraries(kio_floppy ${KDE4_KIO_LIBS} ) -install(TARGETS kio_floppy DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_floppy DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES floppy.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES floppy.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/info/CMakeLists.txt b/kioslave/info/CMakeLists.txt index cb54392b..f7710b4f 100644 --- a/kioslave/info/CMakeLists.txt +++ b/kioslave/info/CMakeLists.txt @@ -12,12 +12,12 @@ kde4_add_plugin(kio_info ${kio_info_PART_SRCS}) target_link_libraries(kio_info ${KDE4_KIO_LIBS} ) -install(TARGETS kio_info DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_info DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kde-info2html.conf DESTINATION ${DATA_INSTALL_DIR}/kio_info ) -install( FILES info.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/kio_info ) +install( FILES kde-info2html.conf DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_info ) +install( FILES info.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS kde-info2html DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_info ) diff --git a/kioslave/man/CMakeLists.txt b/kioslave/man/CMakeLists.txt index 136fb8c2..37449b19 100644 --- a/kioslave/man/CMakeLists.txt +++ b/kioslave/man/CMakeLists.txt @@ -12,11 +12,11 @@ kde4_add_plugin(kio_man ${kio_man_PART_SRCS}) target_link_libraries(kio_man ${KDE4_KIO_LIBS} ) -install(TARGETS kio_man DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_man DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES man.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS kde-man2html DESTINATION ${DATA_INSTALL_DIR}/kio_man ) +install( FILES man.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS kde-man2html DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio_man ) diff --git a/kioslave/mtp/CMakeLists.txt b/kioslave/mtp/CMakeLists.txt index 2419edca..c21a5b83 100644 --- a/kioslave/mtp/CMakeLists.txt +++ b/kioslave/mtp/CMakeLists.txt @@ -16,12 +16,12 @@ include_directories( kde4_add_plugin( kio_mtp ${kio_mtp_PART_SRCS} ) target_link_libraries( kio_mtp ${KDE4_KIO_LIBRARY} ${MTP_LIBRARIES} ${KDE4_SOLID_LIBS} ) -install( TARGETS kio_mtp DESTINATION ${PLUGIN_INSTALL_DIR} ) +install( TARGETS kio_mtp DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES mtp-network.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/dirtree/remote ) -install( FILES solid_mtp.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions ) -install( FILES mtp.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES mtp-network.desktop DESTINATION ${DATA_INSTALL_DIR}/remoteview ) +install( FILES mtp-network.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/konqueror/dirtree/remote ) +install( FILES solid_mtp.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions ) +install( FILES mtp.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES mtp-network.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/remoteview ) diff --git a/kioslave/network/ioslave/CMakeLists.txt b/kioslave/network/ioslave/CMakeLists.txt index a2dd8373..cf84f79f 100644 --- a/kioslave/network/ioslave/CMakeLists.txt +++ b/kioslave/network/ioslave/CMakeLists.txt @@ -20,8 +20,8 @@ kde4_add_plugin( kio_network ${kio_network_SRCS} ) target_link_libraries( kio_network molletnetwork ${KDE4_KIO_LIBS} ) -install( TARGETS kio_network DESTINATION ${PLUGIN_INSTALL_DIR}) +install( TARGETS kio_network DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install( FILES network.protocol DESTINATION ${SERVICES_INSTALL_DIR}) -install( FILES network.desktop DESTINATION ${DATA_INSTALL_DIR}/remoteview) -install( FILES virtualfolder_network.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote) +install( FILES network.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install( FILES network.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/remoteview) +install( FILES virtualfolder_network.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote) diff --git a/kioslave/network/kded/CMakeLists.txt b/kioslave/network/kded/CMakeLists.txt index ab1fb791..3708ef6d 100644 --- a/kioslave/network/kded/CMakeLists.txt +++ b/kioslave/network/kded/CMakeLists.txt @@ -17,7 +17,7 @@ kde4_add_plugin( kded_networkwatcher ${kded_networkwatcher_SRCS} ) target_link_libraries( kded_networkwatcher ${KDE4_KIO_LIBS} molletnetwork ) -install( TARGETS kded_networkwatcher DESTINATION ${PLUGIN_INSTALL_DIR} ) +install( TARGETS kded_networkwatcher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install( FILES networkwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES org.kde.network.kioslavenotifier.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) +install( FILES networkwatcher.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) +install( FILES org.kde.network.kioslavenotifier.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kioslave/network/mimetypes/CMakeLists.txt b/kioslave/network/mimetypes/CMakeLists.txt index c20dc905..825c41e5 100644 --- a/kioslave/network/mimetypes/CMakeLists.txt +++ b/kioslave/network/mimetypes/CMakeLists.txt @@ -2,5 +2,5 @@ set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" ) find_package( SharedMimeInfo REQUIRED ) -install( FILES network.xml DESTINATION ${XDG_MIME_INSTALL_DIR} ) -update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} ) +install( FILES network.xml DESTINATION ${KDE4_XDG_MIME_INSTALL_DIR} ) +update_xdg_mimetypes( ${KDE4_XDG_MIME_INSTALL_DIR} ) diff --git a/kioslave/nfs/CMakeLists.txt b/kioslave/nfs/CMakeLists.txt index 32be86cc..443180a5 100644 --- a/kioslave/nfs/CMakeLists.txt +++ b/kioslave/nfs/CMakeLists.txt @@ -33,9 +33,9 @@ kde4_add_plugin(kio_nfs ${kio_nfs_PART_SRCS}) target_link_libraries(kio_nfs ${KDE4_KIO_LIBS}) -install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_nfs DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES nfs.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES nfs.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/recentdocuments/CMakeLists.txt b/kioslave/recentdocuments/CMakeLists.txt index 2aa0ac3f..4af1896e 100644 --- a/kioslave/recentdocuments/CMakeLists.txt +++ b/kioslave/recentdocuments/CMakeLists.txt @@ -6,7 +6,7 @@ kde4_add_plugin(kio_recentdocuments ${kio_recentdocuments_PART_SRCS}) target_link_libraries(kio_recentdocuments ${KDE4_KIO_LIBS}) -install(TARGETS kio_recentdocuments DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kio_recentdocuments DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -16,9 +16,9 @@ kde4_add_plugin(kded_recentdocumentsnotifier ${kded_recentdocumentsnotifier_PAR target_link_libraries(kded_recentdocumentsnotifier ${KDE4_KIO_LIBS}) -install(TARGETS kded_recentdocumentsnotifier DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kded_recentdocumentsnotifier DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES recentdocumentsnotifier.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES recentdocuments.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES recentdocumentsnotifier.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) +install( FILES recentdocuments.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/remote/CMakeLists.txt b/kioslave/remote/CMakeLists.txt index 522de2df..4cbf247b 100644 --- a/kioslave/remote/CMakeLists.txt +++ b/kioslave/remote/CMakeLists.txt @@ -13,12 +13,12 @@ kde4_add_plugin(kio_remote ${kio_remote_PART_SRCS}) target_link_libraries(kio_remote ${KDE4_KIO_LIBS}) -install(TARGETS kio_remote DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kio_remote DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES remote.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES remote.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kioslave/remote/kdedmodule/CMakeLists.txt b/kioslave/remote/kdedmodule/CMakeLists.txt index 564b6287..13a0b09c 100644 --- a/kioslave/remote/kdedmodule/CMakeLists.txt +++ b/kioslave/remote/kdedmodule/CMakeLists.txt @@ -11,10 +11,10 @@ kde4_add_plugin(kded_remotedirnotify ${kded_remotedirnotify_PART_SRCS}) target_link_libraries(kded_remotedirnotify ${KDE4_KIO_LIBS}) -install(TARGETS kded_remotedirnotify DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kded_remotedirnotify DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES remotedirnotify.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( FILES remotedirnotify.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) diff --git a/kioslave/settings/CMakeLists.txt b/kioslave/settings/CMakeLists.txt index 6f3ebca6..54ab9c96 100644 --- a/kioslave/settings/CMakeLists.txt +++ b/kioslave/settings/CMakeLists.txt @@ -4,8 +4,8 @@ kde4_add_plugin(kio_settings kio_settings.cpp) target_link_libraries(kio_settings ${KDE4_KIO_LIBS} ) -install(TARGETS kio_settings DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_settings DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES settings.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES settings.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/sftp/CMakeLists.txt b/kioslave/sftp/CMakeLists.txt index dcf5b4d1..292e694a 100644 --- a/kioslave/sftp/CMakeLists.txt +++ b/kioslave/sftp/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${LIBSSH_INCLUDE_DIR}) kde4_add_plugin(kio_sftp ${kio_sftp_PART_SRCS}) target_link_libraries(kio_sftp ${KDE4_KIO_LIBS} ${LIBSSH_LIBRARIES}) -install(TARGETS kio_sftp DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_sftp DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install( FILES sftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES sftp.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/smb/CMakeLists.txt b/kioslave/smb/CMakeLists.txt index b6b794cd..2c197dd1 100644 --- a/kioslave/smb/CMakeLists.txt +++ b/kioslave/smb/CMakeLists.txt @@ -19,12 +19,12 @@ kde4_add_plugin(kio_smb ${kio_smb_PART_SRCS}) target_link_libraries(kio_smb ${KDE4_KIO_LIBRARY} ${SAMBA_LIBRARIES} ) -install(TARGETS kio_smb DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_smb DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES smb-network.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/dirtree/remote ) -install( FILES smb.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES smb-network.desktop DESTINATION ${DATA_INSTALL_DIR}/remoteview ) +install( FILES smb-network.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/konqueror/dirtree/remote ) +install( FILES smb.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES smb-network.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/remoteview ) diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt index 2dc452a5..aa528e96 100644 --- a/kioslave/thumbnail/CMakeLists.txt +++ b/kioslave/thumbnail/CMakeLists.txt @@ -33,7 +33,7 @@ kde4_add_plugin(kio_thumbnail ${kio_thumbnail_PART_SRCS}) target_link_libraries(kio_thumbnail ${KDE4_KIO_LIBS}) -install(TARGETS kio_thumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kio_thumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -43,11 +43,11 @@ kde4_add_plugin(imagethumbnail ${imagethumbnail_PART_SRCS}) target_link_libraries(imagethumbnail ${KDE4_KIO_LIBS}) -install(TARGETS imagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS imagethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### -install( FILES directorythumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install( FILES directorythumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) ########### next target ############### @@ -64,8 +64,8 @@ if(HAVE_EXIV2) target_link_libraries(jpegthumbnail ${EXIV2_LIBRARIES}) endif() -install(FILES jpegcreatorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(TARGETS jpegthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES jpegcreatorsettings.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) +install(TARGETS jpegthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -75,7 +75,7 @@ kde4_add_plugin(svgthumbnail ${svgthumbnail_PART_SRCS}) target_link_libraries(svgthumbnail ${KDE4_KIO_LIBS}) -install(TARGETS svgthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS svgthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -85,7 +85,7 @@ kde4_add_plugin(textthumbnail ${textthumbnail_PART_SRCS}) target_link_libraries(textthumbnail ${KDE4_KIO_LIBS}) -install(TARGETS textthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS textthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -95,7 +95,7 @@ kde4_add_plugin(djvuthumbnail ${djvuthumbnail_PART_SRCS}) target_link_libraries(djvuthumbnail ${KDE4_KIO_LIBS}) -install(TARGETS djvuthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS djvuthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -112,8 +112,8 @@ if(OPENEXR_FOUND) # when exceptions are not enabled. set_target_properties(exrthumbnail PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") - install(TARGETS exrthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES exrthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(TARGETS exrthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) + install(FILES exrthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endif() ########### next target ############### @@ -125,8 +125,8 @@ if(X11_Xcursor_FOUND) target_link_libraries(cursorthumbnail ${X11_Xcursor_LIB} ${KDE4_KIO_LIBS}) - install(TARGETS cursorthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES cursorthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(TARGETS cursorthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) + install(FILES cursorthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endif() ########### next target ############### @@ -136,31 +136,31 @@ set(windowsimagethumbnail_SRCS windowsimagecreator.cpp icoutils_common.cpp icout kde4_add_plugin(windowsexethumbnail ${windowsexethumbnail_SRCS}) target_link_libraries( windowsexethumbnail ${KDE4_KIO_LIBS} ) -install(TARGETS windowsexethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS windowsexethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) kde4_add_plugin(windowsimagethumbnail ${windowsimagethumbnail_SRCS}) target_link_libraries(windowsimagethumbnail ${KDE4_KIO_LIBS}) -install(TARGETS windowsimagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS windowsimagethumbnail 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_KPTY_LIBRARY}) -install(TARGETS comicbookthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS comicbookthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### set(epubthumbnail_SRCS epub.cpp epubthumbnail.cpp) kde4_add_plugin(epubthumbnail ${epubthumbnail_SRCS}) target_link_libraries(epubthumbnail ${KDE4_KIO_LIBS}) -install(TARGETS epubthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS epubthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES thumbcreator.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) install( @@ -176,5 +176,5 @@ install( epubthumbnail.desktop windowsimagethumbnail.desktop windowsexethumbnail.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kioslave/trash/CMakeLists.txt b/kioslave/trash/CMakeLists.txt index 63f127b8..315dd4dc 100644 --- a/kioslave/trash/CMakeLists.txt +++ b/kioslave/trash/CMakeLists.txt @@ -19,7 +19,7 @@ kde4_add_plugin(kio_trash ${kio_trash_PART_SRCS}) target_link_libraries(kio_trash ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS kio_trash DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_trash DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) endif(NOT MINGW) ########### next target ############### @@ -37,9 +37,9 @@ 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}) -install(TARGETS kcm_trash DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_trash DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kcmtrash.desktop DESTINATION ${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 4e54a5fd..bd0e84e9 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -46,5 +46,5 @@ endif (PRISON_FOUND) install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS klipper.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(PROGRAMS klipper.desktop DESTINATION ${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 c6ceb3e5..795e6c3c 100644 --- a/kmenuedit/CMakeLists.txt +++ b/kmenuedit/CMakeLists.txt @@ -35,9 +35,9 @@ install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install(PROGRAMS kmenuedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES kmenueditui.rc DESTINATION ${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) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kmenuedit/pixmaps/CMakeLists.txt b/kmenuedit/pixmaps/CMakeLists.txt index 6973edb1..f132508c 100644 --- a/kmenuedit/pixmaps/CMakeLists.txt +++ b/kmenuedit/pixmaps/CMakeLists.txt @@ -1,2 +1,2 @@ -kde4_install_icons( ${DATA_INSTALL_DIR}/kmenuedit/icons ) +kde4_install_icons( ${KDE4_DATA_INSTALL_DIR}/kmenuedit/icons ) diff --git a/knetattach/CMakeLists.txt b/knetattach/CMakeLists.txt index 1808a533..8272f375 100644 --- a/knetattach/CMakeLists.txt +++ b/knetattach/CMakeLists.txt @@ -4,12 +4,12 @@ add_executable(knetattach ${knetattach_SRCS}) target_link_libraries(knetattach ${KDE4_KIO_LIBS}) -install(TARGETS knetattach DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS knetattach DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) ########### install files ############### -install(PROGRAMS knetattach.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(PROGRAMS knetattach.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt index 370b9c4e..84480d54 100644 --- a/knotify/CMakeLists.txt +++ b/knotify/CMakeLists.txt @@ -41,13 +41,13 @@ set_target_properties(knotify PROPERTIES OUTPUT_NAME knotify4 ) install(TARGETS knotify ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( FILES kde.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kde ) -install( FILES hardwarenotifications.notifyrc DESTINATION ${DATA_INSTALL_DIR}/hardwarenotifications ) -install( FILES knotify4.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kde.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kde ) +install( FILES hardwarenotifications.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/hardwarenotifications ) +install( FILES knotify4.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -install( FILES knotifynotifymethod.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES knotifynotifymethod.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) install( TARGETS knotifyplugin ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( FILES ${knotifyplugin_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( FILES ${knotifyplugin_HEADERS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} ) ########### D-Bus Autostart Services ######### @@ -55,4 +55,4 @@ install( FILES ${knotifyplugin_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR} ) configure_file(org.kde.knotify.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.knotify.service) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.knotify.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.knotify.service DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR} ) diff --git a/knotify/sounds/CMakeLists.txt b/knotify/sounds/CMakeLists.txt index 3bba9dd7..7df085c9 100644 --- a/knotify/sounds/CMakeLists.txt +++ b/knotify/sounds/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB _oggfile "*.ogg" ) install(FILES ${_oggfile} - DESTINATION ${SOUND_INSTALL_DIR} ) + DESTINATION ${KDE4_SOUND_INSTALL_DIR} ) diff --git a/kpasswdserver/CMakeLists.txt b/kpasswdserver/CMakeLists.txt index edb482be..81e21ec2 100644 --- a/kpasswdserver/CMakeLists.txt +++ b/kpasswdserver/CMakeLists.txt @@ -10,6 +10,6 @@ kde4_add_plugin(kded_kpasswdserver ${kded_kpasswdserver_SRCS}) target_link_libraries(kded_kpasswdserver ${KDE4_KIO_LIBS}) -install(TARGETS kded_kpasswdserver DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kded_kpasswdserver DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install( FILES kpasswdserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( FILES kpasswdserver.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt index f833259a..a50a5e4f 100644 --- a/krunner/CMakeLists.txt +++ b/krunner/CMakeLists.txt @@ -75,6 +75,6 @@ endif(X11_Xcursor_FOUND) install(TARGETS krunner ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES krunner.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -install(FILES kcfg/klaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(FILES ${krunner_dbusAppXML} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) +install(FILES krunner.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install(FILES kcfg/klaunch.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) +install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kscreensaver/kblank_screensaver/CMakeLists.txt b/kscreensaver/kblank_screensaver/CMakeLists.txt index 33a15caa..dd9b20c5 100644 --- a/kscreensaver/kblank_screensaver/CMakeLists.txt +++ b/kscreensaver/kblank_screensaver/CMakeLists.txt @@ -16,4 +16,4 @@ install(TARGETS kblankscrn.kss ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( FILES kblank.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) +install( FILES kblank.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers ) diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt index 31891708..4cd63a96 100644 --- a/kscreensaver/kdesavers/CMakeLists.txt +++ b/kscreensaver/kdesavers/CMakeLists.txt @@ -105,7 +105,7 @@ add_executable(kclock.kss ${kclock.kss_SRCS}) target_link_libraries(kclock.kss ${KDE4_KDEUI_LIBS} ${LIBMATH} kscreensaver) install(TARGETS kclock.kss ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES KClock.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers) +install(FILES KClock.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers) ########### next target ############### @@ -119,7 +119,7 @@ if(Q_WS_X11) target_link_libraries(kscience.kss ${KDE4_KDEUI_LIBS} kscreensaver ${X11_LIBRARIES}) install(TARGETS kscience.kss ${INSTALL_TARGETS_DEFAULT_ARGS} ) - install(FILES KScience.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers) + install(FILES KScience.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers) endif(Q_WS_X11) ########### next target ############### @@ -131,7 +131,7 @@ if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND KSCREENSAVER_SOUND_SUPPORT) ##add_executable(kfiresaver.kss ${kfiresaver.kss_SRCS}) #target_link_libraries(kfiresaver.kss ${KDE4_KDEUI_LIBS} ) #install(TARGETS kfiresaver.kss ${INSTALL_TARGETS_DEFAULT_ARGS} ) -#install( FILES KFiresaver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) +#install( FILES KFiresaver.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers ) endif(OPENGL_FOUND AND OPENGL_GLU_FOUND AND KSCREENSAVER_SOUND_SUPPORT) ########### next target ############### @@ -182,12 +182,12 @@ if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND QT_QTOPENGL_LIBRARY) target_link_libraries( kgravity.kss ${KDE4_KDEUI_LIBS} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} kscreensaver) install(TARGETS kgravity.kss ${INSTALL_TARGETS_DEFAULT_ARGS} ) - install( FILES KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) + install( FILES KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers ) endif(OPENGL_FOUND AND OPENGL_GLU_FOUND AND QT_QTOPENGL_LIBRARY) ########### install files ############### -install( FILES kscience.png particle.png image.png DESTINATION ${DATA_INSTALL_DIR}/kscreensaver ) -install( FILES KBanner.desktop KPolygon.desktop KSlideshow.desktop KLines-saver.desktop KLorenz.desktop KBlob.desktop KVm.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) +install( FILES kscience.png particle.png image.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kscreensaver ) +install( FILES KBanner.desktop KPolygon.desktop KSlideshow.desktop KLines-saver.desktop KLorenz.desktop KBlob.desktop KVm.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers ) diff --git a/kscreensaver/kdesavers/asciiquarium/CMakeLists.txt b/kscreensaver/kdesavers/asciiquarium/CMakeLists.txt index 44df6668..75a452a3 100644 --- a/kscreensaver/kdesavers/asciiquarium/CMakeLists.txt +++ b/kscreensaver/kdesavers/asciiquarium/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(kdeasciiquarium.kss ${kdeasciiquarium_SRCS}) target_link_libraries(kdeasciiquarium.kss ${KDE4_KDEUI_LIBS} kscreensaver) install(TARGETS kdeasciiquarium.kss ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES asciiquarium.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers) +install(FILES asciiquarium.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers) diff --git a/kscreensaver/kdesavers/data/CMakeLists.txt b/kscreensaver/kdesavers/data/CMakeLists.txt index a073b549..20ccd93a 100644 --- a/kscreensaver/kdesavers/data/CMakeLists.txt +++ b/kscreensaver/kdesavers/data/CMakeLists.txt @@ -7,7 +7,7 @@ if(OPENGL_FOUND AND OPENGL_GLU_FOUND) kfs_kde.png kfs_tux.png kfs_letters1.png kfs_letters2.png kfs_letters.desc kfs_explode.ogg kfs_debris.ogg - DESTINATION ${DATA_INSTALL_DIR}/kfiresaver + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kfiresaver ) endif(OPENGL_FOUND AND OPENGL_GLU_FOUND) diff --git a/kscreensaver/kpartsaver/CMakeLists.txt b/kscreensaver/kpartsaver/CMakeLists.txt index f682262d..d34e2c05 100644 --- a/kscreensaver/kpartsaver/CMakeLists.txt +++ b/kscreensaver/kpartsaver/CMakeLists.txt @@ -11,5 +11,5 @@ target_link_libraries(kpartsaver.kss ${KDE4_KPARTS_LIBS} kscreensaver) install(TARGETS kpartsaver.kss ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( FILES kpartsaver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) +install( FILES kpartsaver.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers ) diff --git a/kscreensaver/krandom_screensaver/CMakeLists.txt b/kscreensaver/krandom_screensaver/CMakeLists.txt index 51b07faa..6fd73369 100644 --- a/kscreensaver/krandom_screensaver/CMakeLists.txt +++ b/kscreensaver/krandom_screensaver/CMakeLists.txt @@ -20,5 +20,5 @@ install(TARGETS krandom.kss ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( FILES krandom.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) +install( FILES krandom.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ScreenSavers ) diff --git a/kscreensaver/libkscreensaver/CMakeLists.txt b/kscreensaver/libkscreensaver/CMakeLists.txt index 74e11d6d..a4575af6 100644 --- a/kscreensaver/libkscreensaver/CMakeLists.txt +++ b/kscreensaver/libkscreensaver/CMakeLists.txt @@ -14,9 +14,9 @@ set_target_properties(kscreensaver PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOV set_target_properties(kscreensaver PROPERTIES DEFINE_SYMBOL MAKE_KSCREENSAVER_LIB) install(TARGETS kscreensaver EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES screensaver.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES screensaver.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) ########### install files ############### -install( FILES kscreensaver.h kscreensaver_vroot.h kscreensaver_export.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +install( FILES kscreensaver.h kscreensaver_vroot.h kscreensaver_export.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} COMPONENT Devel) diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 3f2bb359..e5e47304 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -85,5 +85,5 @@ install(TARGETS kcheckrunning ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( FILES org.kde.KSMServerInterface.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) -install( DIRECTORY themes/ DESTINATION ${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/ksmserver/kcm/CMakeLists.txt b/ksmserver/kcm/CMakeLists.txt index cd5d4231..1e86175f 100644 --- a/ksmserver/kcm/CMakeLists.txt +++ b/ksmserver/kcm/CMakeLists.txt @@ -10,10 +10,10 @@ kde4_add_plugin(kcm_smserver ${kcm_smserver_PART_SRCS}) target_link_libraries(kcm_smserver ${KDE4_KDEUI_LIBS}) -install(TARGETS kcm_smserver DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_smserver DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES kcmsmserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kcmsmserver.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/ksmserver/screenlocker/CMakeLists.txt b/ksmserver/screenlocker/CMakeLists.txt index 6d91395b..5d7d103d 100644 --- a/ksmserver/screenlocker/CMakeLists.txt +++ b/ksmserver/screenlocker/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(screenlocker_static kworkspace ${KDE4_KDEUI_LIBS} ${KDE4_K # Needed to compile on Arm target. set_target_properties(screenlocker_static PROPERTIES COMPILE_FLAGS "-fPIC") -install(FILES kscreenlocker.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ksmserver/ RENAME ksmserver.notifyrc) +install(FILES kscreenlocker.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksmserver/ RENAME ksmserver.notifyrc) diff --git a/ksmserver/screenlocker/greeter/CMakeLists.txt b/ksmserver/screenlocker/greeter/CMakeLists.txt index 6bceef97..0a5b2456 100644 --- a/ksmserver/screenlocker/greeter/CMakeLists.txt +++ b/ksmserver/screenlocker/greeter/CMakeLists.txt @@ -29,9 +29,9 @@ target_link_libraries(kscreenlocker_greet ${KDE4_KDECLARATIVE_LIBS} ) -install(TARGETS kscreenlocker_greet DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kscreenlocker_greet DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) install( DIRECTORY themes/org.kde.passworddialog - DESTINATION ${DATA_INSTALL_DIR}/ksmserver/screenlocker + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksmserver/screenlocker ) diff --git a/ksplash/default/CMakeLists.txt b/ksplash/default/CMakeLists.txt index be3f45ee..6f00e3ec 100644 --- a/ksplash/default/CMakeLists.txt +++ b/ksplash/default/CMakeLists.txt @@ -1,12 +1,12 @@ -install( FILES Preview.png Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default ) +install( FILES Preview.png Theme.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default ) install( FILES 1600x1200/description.txt 1600x1200/background.png 1600x1200/rectangle.png 1600x1200/icon1.png 1600x1200/icon2.png 1600x1200/icon3.png 1600x1200/icon4.png 1600x1200/icon5.png 1600x1200/icon1_anim.png 1600x1200/icon2_anim.png 1600x1200/icon3_anim.png 1600x1200/icon4_anim.png 1600x1200/icon5_anim.png - DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default/1600x1200 ) -install( FILES 1024x768/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default/1024x768 ) -install( FILES 1280x1024/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default/1280x1024 ) -install( FILES 1920x1080/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default/1920x1080 ) -install( FILES 1920x1200/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default/1920x1200 ) -install( FILES 800x600/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Default/800x600 ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default/1600x1200 ) +install( FILES 1024x768/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default/1024x768 ) +install( FILES 1280x1024/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default/1280x1024 ) +install( FILES 1920x1080/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default/1920x1080 ) +install( FILES 1920x1200/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default/1920x1200 ) +install( FILES 800x600/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Default/800x600 ) diff --git a/ksplash/elarun/CMakeLists.txt b/ksplash/elarun/CMakeLists.txt index 872ffa5c..34770ff4 100644 --- a/ksplash/elarun/CMakeLists.txt +++ b/ksplash/elarun/CMakeLists.txt @@ -1,13 +1,13 @@ -install( FILES Preview.png Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun ) +install( FILES Preview.png Theme.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun ) install( FILES 1600x1200/description.txt 1600x1200/background.png 1600x1200/rectangle.png 1600x1200/icon1.png 1600x1200/icon2.png 1600x1200/icon3.png 1600x1200/icon4.png 1600x1200/icon5.png 1600x1200/icon1_anim.png 1600x1200/icon2_anim.png 1600x1200/icon3_anim.png 1600x1200/icon4_anim.png 1600x1200/icon5_anim.png - DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1600x1200 ) -install( FILES 1024x768/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1024x768 ) -install( FILES 1280x1024/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1280x1024 ) -install( FILES 1920x1080/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1920x1080 ) -install( FILES 1920x1200/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1920x1200 ) -install( FILES 600x400/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/600x400 ) -install( FILES 800x600/background.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Elarun/800x600 ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1600x1200 ) +install( FILES 1024x768/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1024x768 ) +install( FILES 1280x1024/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1280x1024 ) +install( FILES 1920x1080/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1920x1080 ) +install( FILES 1920x1200/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/1920x1200 ) +install( FILES 600x400/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/600x400 ) +install( FILES 800x600/background.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Elarun/800x600 ) diff --git a/ksplash/ksplashqml/themes/Minimalistic/CMakeLists.txt b/ksplash/ksplashqml/themes/Minimalistic/CMakeLists.txt index 288071c5..b91931c8 100644 --- a/ksplash/ksplashqml/themes/Minimalistic/CMakeLists.txt +++ b/ksplash/ksplashqml/themes/Minimalistic/CMakeLists.txt @@ -1,7 +1,7 @@ -install(FILES Preview.png Theme.rc main.qml DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic) +install(FILES Preview.png Theme.rc main.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic) -install(FILES images/kdegear.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) -install(FILES images/kdeletter.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) -install(FILES images/kdemask.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) -install(FILES images/kdelogo.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) -install(FILES images/kdelogo-contrast.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) +install(FILES images/kdegear.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) +install(FILES images/kdeletter.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) +install(FILES images/kdemask.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) +install(FILES images/kdelogo.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) +install(FILES images/kdelogo-contrast.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksplash/Themes/Minimalistic/images) diff --git a/ksplash/ksplashx/utils/fromksplashmldefault.sh b/ksplash/ksplashx/utils/fromksplashmldefault.sh index ede14bf1..4a532612 100755 --- a/ksplash/ksplashx/utils/fromksplashmldefault.sh +++ b/ksplash/ksplashx/utils/fromksplashmldefault.sh @@ -50,13 +50,13 @@ cat Theme.rc \ # CMakeLists.txt cat >"$theme"/CMakeLists.txt < EffectWindowList; * as follows: * @code * KWIN_ADD_EFFECT(cooleffect cooleffect.cpp) - * install( FILES cooleffect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin ) + * install( FILES cooleffect.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin ) * @endcode * * @subsection creating-desktop Effect's .desktop file diff --git a/kwin/tabbox/CMakeLists.txt b/kwin/tabbox/CMakeLists.txt index d6196a4f..273ca4cb 100644 --- a/kwin/tabbox/CMakeLists.txt +++ b/kwin/tabbox/CMakeLists.txt @@ -4,5 +4,5 @@ if(ENABLE_TESTING) endif() # Install the KWin/WindowSwitcher service type -install( FILES kwinwindowswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kwindesktopswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES kwinwindowswitcher.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) +install( FILES kwindesktopswitcher.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) diff --git a/kwin/tabbox/qml/CMakeLists.txt b/kwin/tabbox/qml/CMakeLists.txt index 8946dcee..38bffc83 100644 --- a/kwin/tabbox/qml/CMakeLists.txt +++ b/kwin/tabbox/qml/CMakeLists.txt @@ -1,39 +1,39 @@ -install( FILES tabbox.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) +install( FILES tabbox.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) # packages -install( DIRECTORY clients/big_icons DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/compact DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/informative DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/present_windows DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/small_icons DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/text DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/thumbnails DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY clients/window_strip DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/big_icons DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/compact DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/informative DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/present_windows DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/small_icons DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/text DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/thumbnails DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) +install( DIRECTORY clients/window_strip DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox ) -install( DIRECTORY desktops/informative DESTINATION ${DATA_INSTALL_DIR}/kwin/desktoptabbox ) -install( DIRECTORY desktops/previews DESTINATION ${DATA_INSTALL_DIR}/kwin/desktoptabbox ) +install( DIRECTORY desktops/informative DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/desktoptabbox ) +install( DIRECTORY desktops/previews DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/desktoptabbox ) # service files -install( FILES clients/big_icons/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_big_icons.desktop ) -install( FILES clients/compact/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_compact.desktop ) -install( FILES clients/informative/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_informative.desktop ) -install( FILES clients/present_windows/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_present_windows.desktop ) -install( FILES clients/small_icons/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_small_icons.desktop ) -install( FILES clients/text/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_text.desktop ) -install( FILES clients/thumbnails/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_thumbnails.desktop ) -install( FILES clients/window_strip/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_window_strip.desktop ) +install( FILES clients/big_icons/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_big_icons.desktop ) +install( FILES clients/compact/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_compact.desktop ) +install( FILES clients/informative/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_informative.desktop ) +install( FILES clients/present_windows/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_present_windows.desktop ) +install( FILES clients/small_icons/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_small_icons.desktop ) +install( FILES clients/text/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_text.desktop ) +install( FILES clients/thumbnails/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_thumbnails.desktop ) +install( FILES clients/window_strip/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_window_switcher_window_strip.desktop ) -install( FILES desktops/informative/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_desktop_switcher_informative.desktop ) -install( FILES desktops/previews/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin RENAME kwin4_desktop_switcher_previews.desktop ) +install( FILES desktops/informative/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_desktop_switcher_informative.desktop ) +install( FILES desktops/previews/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kwin RENAME kwin4_desktop_switcher_previews.desktop ) -install (FILES IconTabBox.qml ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/big_icons/contents/ui) -install (FILES IconTabBox.qml ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/small_icons/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/compact/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/informative/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/present_windows/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/thumbnails/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/tabbox/text/contents/ui) +install (FILES IconTabBox.qml ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/big_icons/contents/ui) +install (FILES IconTabBox.qml ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/small_icons/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/compact/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/informative/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/present_windows/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/thumbnails/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/tabbox/text/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/desktoptabbox/informative/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/desktoptabbox/previews/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/desktoptabbox/informative/contents/ui) +install (FILES ShadowedSvgItem.qml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/desktoptabbox/previews/contents/ui) diff --git a/l10n/CMakeLists.txt b/l10n/CMakeLists.txt index d0a84698..52dfdd6d 100644 --- a/l10n/CMakeLists.txt +++ b/l10n/CMakeLists.txt @@ -1,7 +1,7 @@ -install( FILES northafrica.desktop westafrica.desktop southafrica.desktop centralafrica.desktop eastafrica.desktop caribbean.desktop oceania.desktop centralamerica.desktop northamerica.desktop southamerica.desktop easteurope.desktop westeurope.desktop centraleurope.desktop northeurope.desktop southeurope.desktop southasia.desktop southeastasia.desktop eastasia.desktop centralasia.desktop middleeast.desktop DESTINATION ${LOCALE_INSTALL_DIR}/l10n ) +install( FILES northafrica.desktop westafrica.desktop southafrica.desktop centralafrica.desktop eastafrica.desktop caribbean.desktop oceania.desktop centralamerica.desktop northamerica.desktop southamerica.desktop easteurope.desktop westeurope.desktop centraleurope.desktop northeurope.desktop southeurope.desktop southasia.desktop southeastasia.desktop eastasia.desktop centralasia.desktop middleeast.desktop DESTINATION ${KDE4_LOCALE_INSTALL_DIR}/l10n ) set(listLang C ad ae af ag ai al am an ao ar as at au aw ax az ba bb bd be bf bg bh bi bj bl bm bn bo br bs bt bw by bz ca cc cd cf cg ch ci ck cl cm cn co cr cu cv cx cy cz de dj dk dm do dz ec ee eg eh er es et fi fj fk fm fo fr ga gb gd ge gf gg gh gi gl gm gn gp gq gr gt gu gw gy hk hn hr ht hu id ie il im in iq ir is it je jm jo jp ke kg kh ki km kn kp kr kw ky kz la lb lc li lk lr ls lt lu lv ly ma mc md me mf mg mh mk ml mm mn mo mp mq mr ms mt mu mv mw mx my mz na nc ne nf ng ni nl no np nr nu nz om pa pe pf pg ph pk pl pm pn pr ps pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sk sl sm sn so sr ss st sv sy sz tc td tg th tj tk tl tm tn to tp tr tt tv tw tz ua ug us uy uz va vc ve vg vi vn vu wf ws ye yt za zm zw ) foreach (_current_LANG ${listLang}) - install(FILES ${_current_LANG}/flag.png ${_current_LANG}/entry.desktop DESTINATION ${LOCALE_INSTALL_DIR}/l10n/${_current_LANG}) + install(FILES ${_current_LANG}/flag.png ${_current_LANG}/entry.desktop DESTINATION ${KDE4_LOCALE_INSTALL_DIR}/l10n/${_current_LANG}) endforeach(_current_LANG ${listLang}) diff --git a/libs/kdm/CMakeLists.txt b/libs/kdm/CMakeLists.txt index 7a7f4252..2ea1f120 100644 --- a/libs/kdm/CMakeLists.txt +++ b/libs/kdm/CMakeLists.txt @@ -11,7 +11,7 @@ kde4_add_plugin(kgreet_classic ${kgreet_classic_PART_SRCS}) target_link_libraries(kgreet_classic ${KDE4_KDEUI_LIBS}) -install(TARGETS kgreet_classic DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kgreet_classic DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### @@ -24,7 +24,7 @@ kde4_add_plugin(kgreet_winbind ${kgreet_winbind_PART_SRCS}) target_link_libraries(kgreet_winbind ${KDE4_KDEUI_LIBS}) -install(TARGETS kgreet_winbind DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kgreet_winbind DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### next target ############### @@ -36,7 +36,7 @@ kde4_add_plugin(kgreet_generic ${kgreet_generic_PART_SRCS}) target_link_libraries(kgreet_generic ${KDE4_KDEUI_LIBS}) -install(TARGETS kgreet_generic DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kgreet_generic DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) @@ -44,4 +44,4 @@ install(TARGETS kgreet_generic DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kgreeterplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) +install( FILES kgreeterplugin.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} COMPONENT Devel ) diff --git a/libs/kephal/client/CMakeLists.txt b/libs/kephal/client/CMakeLists.txt index d1c5363e..5886f03f 100644 --- a/libs/kephal/client/CMakeLists.txt +++ b/libs/kephal/client/CMakeLists.txt @@ -49,4 +49,4 @@ set_target_properties(kephal PROPERTIES INSTALL (TARGETS kephal EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -INSTALL (FILES FindKephal.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) +INSTALL (FILES FindKephal.cmake DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules) diff --git a/libs/kephal/client/FindKephal.cmake b/libs/kephal/client/FindKephal.cmake index fdc130f0..12804132 100644 --- a/libs/kephal/client/FindKephal.cmake +++ b/libs/kephal/client/FindKephal.cmake @@ -4,11 +4,11 @@ ENDIF (KEPHAL_INCLUDE_DIR AND KEPHAL_LIBRARY) FIND_PATH(KEPHAL_INCLUDE_DIR NAMES kephal/screens.h PATHS ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR}) + ${KDE4_INCLUDE_INSTALL_DIR}) FIND_LIBRARY(KEPHAL_LIBRARY NAMES kephal PATHS ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR}) + ${KDE4_LIB_INSTALL_DIR}) IF (KEPHAL_INCLUDE_DIR AND KEPHAL_LIBRARY) SET(KEPHAL_FOUND TRUE) diff --git a/libs/kephal/service/CMakeLists.txt b/libs/kephal/service/CMakeLists.txt index 6ca9fefe..e0b9b4af 100644 --- a/libs/kephal/service/CMakeLists.txt +++ b/libs/kephal/service/CMakeLists.txt @@ -81,6 +81,6 @@ target_link_libraries(kded_kephal ${service_libs}) add_executable(kephald ${standalone_kephald_SRCS}) target_link_libraries(kephald ${service_libs}) -install(TARGETS kded_kephal DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_kephal DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kephal.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(FILES kephal.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/libs/ksysguard/CMakeLists.txt b/libs/ksysguard/CMakeLists.txt index 478dc54f..1af2ee8a 100644 --- a/libs/ksysguard/CMakeLists.txt +++ b/libs/ksysguard/CMakeLists.txt @@ -22,5 +22,5 @@ if(ENABLE_TESTING) add_subdirectory( tests ) endif() -install(DIRECTORY scripts/ DESTINATION ${DATA_INSTALL_DIR}/ksysguard/scripts) +install(DIRECTORY scripts/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksysguard/scripts) diff --git a/libs/ksysguard/ksgrd/CMakeLists.txt b/libs/ksysguard/ksgrd/CMakeLists.txt index 9eb16279..d5482f17 100644 --- a/libs/ksysguard/ksgrd/CMakeLists.txt +++ b/libs/ksysguard/ksgrd/CMakeLists.txt @@ -21,7 +21,7 @@ install(TARGETS ksgrd EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAUL ########### install files ############### -install(FILES SensorAgent.h SensorClient.h SensorManager.h SensorShellAgent.h SensorSocketAgent.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksgrd COMPONENT Devel) +install(FILES SensorAgent.h SensorClient.h SensorManager.h SensorShellAgent.h SensorSocketAgent.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksgrd COMPONENT Devel) diff --git a/libs/ksysguard/lsofui/CMakeLists.txt b/libs/ksysguard/lsofui/CMakeLists.txt index d89e1946..6764d344 100644 --- a/libs/ksysguard/lsofui/CMakeLists.txt +++ b/libs/ksysguard/lsofui/CMakeLists.txt @@ -22,7 +22,7 @@ install( install( FILES lsof.h - DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel ) @@ -34,5 +34,5 @@ target_link_libraries(ksysguardlsofwidgets ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRA install( TARGETS ksysguardlsofwidgets - DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/designer + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/designer ) diff --git a/libs/ksysguard/processcore/CMakeLists.txt b/libs/ksysguard/processcore/CMakeLists.txt index f8963c08..df3890a1 100644 --- a/libs/ksysguard/processcore/CMakeLists.txt +++ b/libs/ksysguard/processcore/CMakeLists.txt @@ -26,7 +26,7 @@ install(TARGETS processcore EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_ ########### install files ############### -install( FILES processes.h process.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel) +install( FILES processes.h process.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel) #------ KAuth stuff @@ -39,7 +39,7 @@ set(ksysguardprocesslist_helper_srcs add_executable(ksysguardprocesslist_helper ${ksysguardprocesslist_helper_srcs}) target_link_libraries(ksysguardprocesslist_helper ${KDE4_KDECORE_LIBS}) -install(TARGETS ksysguardprocesslist_helper DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS ksysguardprocesslist_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) kde4_install_auth_helper_files(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper root) diff --git a/libs/ksysguard/processui/CMakeLists.txt b/libs/ksysguard/processui/CMakeLists.txt index 399a1475..725b5275 100644 --- a/libs/ksysguard/processui/CMakeLists.txt +++ b/libs/ksysguard/processui/CMakeLists.txt @@ -45,7 +45,7 @@ target_link_libraries(ksysguardwidgets ${KDE4_KDEUI_LIBS} processui) install( TARGETS ksysguardwidgets - DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/designer + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/designer ) install( @@ -54,7 +54,7 @@ install( ProcessFilter.h KTextEditVT.h ksysguardprocesslist.h - DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel ) diff --git a/libs/ksysguard/signalplotter/CMakeLists.txt b/libs/ksysguard/signalplotter/CMakeLists.txt index b3b71246..82fc83e7 100644 --- a/libs/ksysguard/signalplotter/CMakeLists.txt +++ b/libs/ksysguard/signalplotter/CMakeLists.txt @@ -27,11 +27,11 @@ target_link_libraries(ksignalplotterwidgets ${KDE4_KDEUI_LIBS} ksignalplotter) install( TARGETS ksignalplotterwidgets - DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/designer + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/designer ) install( FILES ksignalplotter.h - DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel ) diff --git a/libs/kworkspace/CMakeLists.txt b/libs/kworkspace/CMakeLists.txt index 54e903e9..2ba56044 100644 --- a/libs/kworkspace/CMakeLists.txt +++ b/libs/kworkspace/CMakeLists.txt @@ -41,6 +41,6 @@ install( kwindowlistmenu.h kworkspace.h kworkspace_export.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kworkspace + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kworkspace COMPONENT Devel ) diff --git a/libs/plasmaclock/CMakeLists.txt b/libs/plasmaclock/CMakeLists.txt index 9ad7f7c9..7291457a 100644 --- a/libs/plasmaclock/CMakeLists.txt +++ b/libs/plasmaclock/CMakeLists.txt @@ -24,5 +24,5 @@ SOVERSION ${GENERIC_LIB_SOVERSION} ) #clockapplet.h install(FILES clockapplet.h calendar.h calendartable.h plasmaclock_export.h - DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaclock COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaclock COMPONENT Devel) install(TARGETS plasmaclock EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/libs/plasmagenericshell/CMakeLists.txt b/libs/plasmagenericshell/CMakeLists.txt index b07d0ce6..e57b82bd 100644 --- a/libs/plasmagenericshell/CMakeLists.txt +++ b/libs/plasmagenericshell/CMakeLists.txt @@ -46,10 +46,10 @@ set_target_properties(plasmagenericshell PROPERTIES VERSION ${GENERIC_LIB_VERSIO SOVERSION ${GENERIC_LIB_SOVERSION} ) install(DIRECTORY widgetsexplorer/package/ - DESTINATION ${DATA_INSTALL_DIR}/plasma/packages/org.kde.desktop.widgetexplorer + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/packages/org.kde.desktop.widgetexplorer PATTERN "Messages.sh" EXCLUDE ) install(TARGETS plasmagenericshell EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) -INSTALL(FILES plasma-layout-template.desktop DESTINATION ${SERVICETYPES_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 38cd4c3c..fe86f10a 100644 --- a/libs/taskmanager/CMakeLists.txt +++ b/libs/taskmanager/CMakeLists.txt @@ -58,7 +58,7 @@ install(FILES taskitem.h taskmanager.h taskmanager_export.h - DESTINATION ${INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel ) diff --git a/localization/currency/CMakeLists.txt b/localization/currency/CMakeLists.txt index 9fb01026..23c025ce 100644 --- a/localization/currency/CMakeLists.txt +++ b/localization/currency/CMakeLists.txt @@ -206,5 +206,5 @@ install( zmk.desktop zwd.desktop zwl.desktop - DESTINATION ${LOCALE_INSTALL_DIR}/currency + DESTINATION ${KDE4_LOCALE_INSTALL_DIR}/currency ) diff --git a/menu/desktop/CMakeLists.txt b/menu/desktop/CMakeLists.txt index fa6af4d2..ee50383c 100644 --- a/menu/desktop/CMakeLists.txt +++ b/menu/desktop/CMakeLists.txt @@ -39,4 +39,4 @@ kde-utilities-peripherals.directory kde-utilities-pim.directory kde-utilities-xutils.directory -DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} ) +DESTINATION ${KDE4_XDG_DIRECTORY_INSTALL_DIR} ) diff --git a/pics/emoticons/CMakeLists.txt b/pics/emoticons/CMakeLists.txt index cae57e11..130644ce 100644 --- a/pics/emoticons/CMakeLists.txt +++ b/pics/emoticons/CMakeLists.txt @@ -1,7 +1,7 @@ ########### install files ############### -install( FILES angry.png bat.png beer.png biggrin.png cake.png camera.png cat.png clock.png cocktail.png confused.png cry.png cup.png dog.png email.png embarassed.png emoticons.xml film.png kiss.png lightbulb.png love.png note.png oh.png omg.png phone.png present.png rose.png sad.png shade.png sleep.png smile.png star.png teeth.png thumbs_down.png thumbs_up.png tongue.png unhappy.png unlove.png wilted_rose.png wink.png foot_in_mouth.png innocent.png undecided.png DESTINATION ${SHARE_INSTALL_PREFIX}/emoticons/kde4) +install( FILES angry.png bat.png beer.png biggrin.png cake.png camera.png cat.png clock.png cocktail.png confused.png cry.png cup.png dog.png email.png embarassed.png emoticons.xml film.png kiss.png lightbulb.png love.png note.png oh.png omg.png phone.png present.png rose.png sad.png shade.png sleep.png smile.png star.png teeth.png thumbs_down.png thumbs_up.png tongue.png unhappy.png unlove.png wilted_rose.png wink.png foot_in_mouth.png innocent.png undecided.png DESTINATION ${KDE4_SHARE_INSTALL_PREFIX}/emoticons/kde4) diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index 3a6ca8c7..b8acb969 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -5,8 +5,8 @@ MACRO(installPackage dir component) IF(NOT root) SET(root plasma/plasmoids) ENDIF(NOT root) - install(DIRECTORY ${dir}/ DESTINATION ${DATA_INSTALL_DIR}/${root}/${component} PATTERN Messages.sh EXCLUDE PATTERN CMakeLists.txt EXCLUDE) - install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-${component}.desktop) + install(DIRECTORY ${dir}/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/${root}/${component} PATTERN Messages.sh EXCLUDE PATTERN CMakeLists.txt EXCLUDE) + install(FILES ${dir}/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-${component}.desktop) ENDMACRO(installPackage) add_subdirectory(applets) diff --git a/plasma/applets/analog-clock/CMakeLists.txt b/plasma/applets/analog-clock/CMakeLists.txt index cdd27821..65bb95cb 100644 --- a/plasma/applets/analog-clock/CMakeLists.txt +++ b/plasma/applets/analog-clock/CMakeLists.txt @@ -7,5 +7,5 @@ set(clock_SRCS kde4_add_plugin(plasma_applet_clock ${clock_SRCS}) target_link_libraries(plasma_applet_clock ${KDE4_PLASMA_LIBS} plasmaclock ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_clock DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-analogclock.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_clock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-analogclock.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/batterymonitor/CMakeLists.txt b/plasma/applets/batterymonitor/CMakeLists.txt index 0fdbbf92..3a449152 100644 --- a/plasma/applets/batterymonitor/CMakeLists.txt +++ b/plasma/applets/batterymonitor/CMakeLists.txt @@ -1,14 +1,14 @@ project(batterymonitor) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/battery) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/battery) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/battery) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/battery) install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-batterymonitor.desktop) install(FILES battery-oxygen.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) diff --git a/plasma/applets/calendar/CMakeLists.txt b/plasma/applets/calendar/CMakeLists.txt index 807d7291..4c41e124 100644 --- a/plasma/applets/calendar/CMakeLists.txt +++ b/plasma/applets/calendar/CMakeLists.txt @@ -8,6 +8,6 @@ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) kde4_add_plugin(plasma_applet_calendar ${calendar_SRCS}) target_link_libraries(plasma_applet_calendar ${KDE4_PLASMA_LIBS} plasmaclock ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_calendar DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES mini-calendar.svgz DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/calendar/) +install(TARGETS plasma_applet_calendar DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-calendar.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES mini-calendar.svgz DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/calendar/) diff --git a/plasma/applets/devicenotifier/CMakeLists.txt b/plasma/applets/devicenotifier/CMakeLists.txt index 8d70303a..aa9cea46 100644 --- a/plasma/applets/devicenotifier/CMakeLists.txt +++ b/plasma/applets/devicenotifier/CMakeLists.txt @@ -1,10 +1,10 @@ project(devicenotifier) install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/notifier) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/notifier) install(FILES package/metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-devicenotifier.desktop) -install(FILES test-predicate-openinwindow.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions ) +install(FILES test-predicate-openinwindow.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions ) diff --git a/plasma/applets/digital-clock/CMakeLists.txt b/plasma/applets/digital-clock/CMakeLists.txt index e78c88ce..461fca01 100644 --- a/plasma/applets/digital-clock/CMakeLists.txt +++ b/plasma/applets/digital-clock/CMakeLists.txt @@ -12,6 +12,6 @@ target_link_libraries(plasma_applet_dig_clock ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_dig_clock DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-digitalclock.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_dig_clock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-digitalclock.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/folderview/CMakeLists.txt b/plasma/applets/folderview/CMakeLists.txt index 457ddb89..cb29e80c 100644 --- a/plasma/applets/folderview/CMakeLists.txt +++ b/plasma/applets/folderview/CMakeLists.txt @@ -37,6 +37,6 @@ kde4_add_plugin(plasma_applet_folderview ${folderview_SRCS}) target_link_libraries(plasma_applet_folderview ${KDE4_PLASMA_LIBS} ${LIBKONQ_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} ${X11_LIBRARIES}) -install(TARGETS plasma_applet_folderview DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-folderview.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_folderview DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-folderview.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/icon/CMakeLists.txt b/plasma/applets/icon/CMakeLists.txt index 10946662..a4391fda 100644 --- a/plasma/applets/icon/CMakeLists.txt +++ b/plasma/applets/icon/CMakeLists.txt @@ -5,5 +5,5 @@ set(icon_SRCS kde4_add_plugin(plasma_applet_icon ${icon_SRCS}) target_link_libraries(plasma_applet_icon ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_icon DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-icon.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 7dc0b43a..c8c5ef8b 100644 --- a/plasma/applets/kickoff/CMakeLists.txt +++ b/plasma/applets/kickoff/CMakeLists.txt @@ -51,8 +51,8 @@ set(Applet_SRCS kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) target_link_libraries(plasma_applet_launcher ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS} kickoff) -install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_launcher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) ####################################################################################### # Kickoff Simple KMenu Plasma Applet @@ -64,8 +64,8 @@ set(SimpleApplet_SRCS ) kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) target_link_libraries(plasma_applet_simplelauncher ${KDE4_KCMUTILS_LIBS} ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS} kickoff) -install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_simplelauncher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) # Kickoff Standalone Test Application #IF (CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/plasma/applets/lock_logout/CMakeLists.txt b/plasma/applets/lock_logout/CMakeLists.txt index 744ed785..15fd7a99 100644 --- a/plasma/applets/lock_logout/CMakeLists.txt +++ b/plasma/applets/lock_logout/CMakeLists.txt @@ -1,10 +1,10 @@ project(lockout) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/lockout) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/lockout) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/lockout) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/lockout) install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-lockout.desktop) diff --git a/plasma/applets/pager/CMakeLists.txt b/plasma/applets/pager/CMakeLists.txt index 632eb6e4..d330e5ab 100644 --- a/plasma/applets/pager/CMakeLists.txt +++ b/plasma/applets/pager/CMakeLists.txt @@ -14,6 +14,6 @@ target_link_libraries(plasma_applet_pager ${QT_QTDECLARATIVE_LIBRARY} taskmanager) -install(TARGETS plasma_applet_pager DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-pager-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/packages/org.kde.pager) +install(TARGETS plasma_applet_pager DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-pager-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(DIRECTORY package/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/packages/org.kde.pager) diff --git a/plasma/applets/panelspacer/CMakeLists.txt b/plasma/applets/panelspacer/CMakeLists.txt index 0430773d..bfffd1ce 100644 --- a/plasma/applets/panelspacer/CMakeLists.txt +++ b/plasma/applets/panelspacer/CMakeLists.txt @@ -6,9 +6,9 @@ set(panelspacer_SRCS kde4_add_plugin(plasma_applet_panelspacer_internal ${panelspacer_SRCS}) target_link_libraries(plasma_applet_panelspacer_internal ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_applet_panelspacer_internal DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_panelspacer_internal DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-panelspacer-internal.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-applet-panelspacer-internal.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/quicklaunch/CMakeLists.txt b/plasma/applets/quicklaunch/CMakeLists.txt index c2a665bf..92caaea5 100644 --- a/plasma/applets/quicklaunch/CMakeLists.txt +++ b/plasma/applets/quicklaunch/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(plasma_applet_quicklaunch ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBRARY}) -install(TARGETS plasma_applet_quicklaunch DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-quicklaunch.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 f00a9473..aa0f7ae4 100644 --- a/plasma/applets/system-monitor/CMakeLists.txt +++ b/plasma/applets/system-monitor/CMakeLists.txt @@ -98,7 +98,7 @@ install(TARGETS plasma_applet_sm_cpu plasma_applet_sm_ram plasma_applet_system-monitor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-sm_hdd_activity.desktop plasma-applet-sm_hdd.desktop @@ -108,7 +108,7 @@ install(FILES plasma-applet-sm_cpu.desktop plasma-applet-sm_ram.desktop plasma-applet-system-monitor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES hdd_panel.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/system-monitor/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/system-monitor/) diff --git a/plasma/applets/systemtray/CMakeLists.txt b/plasma/applets/systemtray/CMakeLists.txt index 31bbd2f7..2b00dc9c 100644 --- a/plasma/applets/systemtray/CMakeLists.txt +++ b/plasma/applets/systemtray/CMakeLists.txt @@ -49,6 +49,6 @@ if(X11_Xcomposite_FOUND) target_link_libraries(plasma_applet_systemtray ${X11_Xcomposite_LIB}) endif() -install(TARGETS plasma_applet_systemtray DESTINATION ${PLUGIN_INSTALL_DIR}) -install(DIRECTORY "package/" DESTINATION "${DATA_INSTALL_DIR}/${data_install_dir}") -install(FILES plasma-applet-systemtray.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_systemtray DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(DIRECTORY "package/" DESTINATION "${KDE4_DATA_INSTALL_DIR}/${data_install_dir}") +install(FILES plasma-applet-systemtray.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/applets/tasks/CMakeLists.txt b/plasma/applets/tasks/CMakeLists.txt index 0577b043..c191f0dc 100644 --- a/plasma/applets/tasks/CMakeLists.txt +++ b/plasma/applets/tasks/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_plugin(plasma_applet_tasks ${tasks_SRCS}) target_link_libraries(plasma_applet_tasks ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTDECLARATIVE_LIBRARY} taskmanager) -install(TARGETS plasma_applet_tasks DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-tasks-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_tasks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-tasks-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/packages/org.kde.plasma.tasks) +install(DIRECTORY package/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/packages/org.kde.plasma.tasks) diff --git a/plasma/applets/trash/CMakeLists.txt b/plasma/applets/trash/CMakeLists.txt index c96fdcfd..89ffa60c 100644 --- a/plasma/applets/trash/CMakeLists.txt +++ b/plasma/applets/trash/CMakeLists.txt @@ -6,5 +6,5 @@ set(trash_SRCS 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}) -install(TARGETS plasma_applet_trash DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-trash.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 5ae26018..9bdcfdda 100644 --- a/plasma/applets/windowlist/CMakeLists.txt +++ b/plasma/applets/windowlist/CMakeLists.txt @@ -10,5 +10,5 @@ target_link_libraries(plasma_applet_windowlist kworkspace ) -install(TARGETS plasma_applet_windowlist DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-windowlist.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_windowlist DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-windowlist.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/containmentactions/applauncher/CMakeLists.txt b/plasma/containmentactions/applauncher/CMakeLists.txt index 7025eaaf..4b2b6cf2 100644 --- a/plasma/containmentactions/applauncher/CMakeLists.txt +++ b/plasma/containmentactions/applauncher/CMakeLists.txt @@ -7,5 +7,5 @@ set(applauncher_SRCS kde4_add_plugin(plasma_containmentactions_applauncher ${applauncher_SRCS}) target_link_libraries(plasma_containmentactions_applauncher ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_containmentactions_applauncher DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containmentactions-applauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 677bed2e..226bd8ff 100644 --- a/plasma/containmentactions/contextmenu/CMakeLists.txt +++ b/plasma/containmentactions/contextmenu/CMakeLists.txt @@ -14,5 +14,5 @@ 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) -install(TARGETS plasma_containmentactions_contextmenu DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containmentactions-contextmenu.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 66310f93..f3127e1c 100644 --- a/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt +++ b/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt @@ -7,5 +7,5 @@ set(contextmenu_SRCS kde4_add_plugin(plasma_containmentactions_minimalcontextmenu ${contextmenu_SRCS}) target_link_libraries(plasma_containmentactions_minimalcontextmenu ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_containmentactions_minimalcontextmenu DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containmentactions-minimalcontextmenu.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 10ce544b..e2d871bf 100644 --- a/plasma/containmentactions/paste/CMakeLists.txt +++ b/plasma/containmentactions/paste/CMakeLists.txt @@ -7,5 +7,5 @@ set(paste_SRCS kde4_add_plugin(plasma_containmentactions_paste ${paste_SRCS}) target_link_libraries(plasma_containmentactions_paste ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_containmentactions_paste DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containmentactions-paste.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 c6f30da6..936601ac 100644 --- a/plasma/containmentactions/switchdesktop/CMakeLists.txt +++ b/plasma/containmentactions/switchdesktop/CMakeLists.txt @@ -7,5 +7,5 @@ set(switchdesktop_SRCS kde4_add_plugin(plasma_containmentactions_switchdesktop ${switchdesktop_SRCS}) target_link_libraries(plasma_containmentactions_switchdesktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_containmentactions_switchdesktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containmentactions-switchdesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 910af93b..5bae2a02 100644 --- a/plasma/containmentactions/switchwindow/CMakeLists.txt +++ b/plasma/containmentactions/switchwindow/CMakeLists.txt @@ -8,5 +8,5 @@ set(switchwindow_SRCS kde4_add_plugin(plasma_containmentactions_switchwindow ${switchwindow_SRCS}) target_link_libraries(plasma_containmentactions_switchwindow ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_containmentactions_switchwindow DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containmentactions-switchwindow.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 91868c48..0a83ebd7 100644 --- a/plasma/containments/desktop/CMakeLists.txt +++ b/plasma/containments/desktop/CMakeLists.txt @@ -9,6 +9,6 @@ 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}) -install(TARGETS plasma_containment_desktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-desktop.desktop plasma-containment-desktopdashboard.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES plasma_desktop_containment.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules) +install(TARGETS plasma_containment_desktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-containment-desktop.desktop plasma-containment-desktopdashboard.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES plasma_desktop_containment.kwinrules DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwin/default_rules) diff --git a/plasma/containments/newspaper/CMakeLists.txt b/plasma/containments/newspaper/CMakeLists.txt index 3c5e17f9..9031bb4e 100644 --- a/plasma/containments/newspaper/CMakeLists.txt +++ b/plasma/containments/newspaper/CMakeLists.txt @@ -12,5 +12,5 @@ set(newspaper_SRCS kde4_add_plugin(plasma_containment_newspaper ${newspaper_SRCS}) target_link_libraries(plasma_containment_newspaper ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_containment_newspaper DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-newspaper.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 0e2b7ce3..983467d4 100644 --- a/plasma/containments/panel/CMakeLists.txt +++ b/plasma/containments/panel/CMakeLists.txt @@ -8,5 +8,5 @@ include_directories( kde4_add_plugin(plasma_containment_panel ${panel_SRCS}) target_link_libraries(plasma_containment_panel ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} kephal) -install(TARGETS plasma_containment_panel DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-panel.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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/containments/screensaver/CMakeLists.txt b/plasma/containments/screensaver/CMakeLists.txt index b11dbd9f..eddc6095 100644 --- a/plasma/containments/screensaver/CMakeLists.txt +++ b/plasma/containments/screensaver/CMakeLists.txt @@ -5,6 +5,6 @@ set(desktop_SRCS kde4_add_plugin(plasma_containment_saverdesktop ${desktop_SRCS}) target_link_libraries(plasma_containment_saverdesktop ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_containment_saverdesktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-saverdesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_containment_saverdesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-containment-saverdesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/applicationjobs/CMakeLists.txt b/plasma/dataengines/applicationjobs/CMakeLists.txt index 5b7a1aab..98adbd12 100644 --- a/plasma/dataengines/applicationjobs/CMakeLists.txt +++ b/plasma/dataengines/applicationjobs/CMakeLists.txt @@ -15,7 +15,7 @@ qt4_add_dbus_adaptor(kuiserver_engine_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.J kde4_add_plugin(plasma_engine_applicationjobs ${kuiserver_engine_SRCS}) target_link_libraries(plasma_engine_applicationjobs ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_engine_applicationjobs DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-applicationjobs.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES applicationjobs.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_applicationjobs DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-applicationjobs.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES applicationjobs.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/apps/CMakeLists.txt b/plasma/dataengines/apps/CMakeLists.txt index 05d139cb..70c98c4f 100644 --- a/plasma/dataengines/apps/CMakeLists.txt +++ b/plasma/dataengines/apps/CMakeLists.txt @@ -8,6 +8,6 @@ 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}) -install(TARGETS plasma_engine_apps DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-apps.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES apps.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_apps DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-apps.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES apps.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/devicenotifications/CMakeLists.txt b/plasma/dataengines/devicenotifications/CMakeLists.txt index 7eff4166..472fb016 100644 --- a/plasma/dataengines/devicenotifications/CMakeLists.txt +++ b/plasma/dataengines/devicenotifications/CMakeLists.txt @@ -8,5 +8,5 @@ kde4_add_plugin(plasma_engine_devicenotifications ${device_notifications_engine_ target_link_libraries(plasma_engine_devicenotifications ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS}) -install(TARGETS plasma_engine_devicenotifications DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-devicenotifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 2cab7c25..f34d2703 100644 --- a/plasma/dataengines/dict/CMakeLists.txt +++ b/plasma/dataengines/dict/CMakeLists.txt @@ -7,6 +7,6 @@ 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}) -install(TARGETS plasma_engine_dict DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-dict.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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/executable/CMakeLists.txt b/plasma/dataengines/executable/CMakeLists.txt index 2baf1fa9..7ef361b9 100644 --- a/plasma/dataengines/executable/CMakeLists.txt +++ b/plasma/dataengines/executable/CMakeLists.txt @@ -5,6 +5,6 @@ set(executable_engine_SRCS kde4_add_plugin(plasma_engine_executable ${executable_engine_SRCS}) target_link_libraries(plasma_engine_executable ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS}) -install(TARGETS plasma_engine_executable DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-executable.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS plasma_engine_executable DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-executable.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/favicons/CMakeLists.txt b/plasma/dataengines/favicons/CMakeLists.txt index 9339ec5b..13762973 100644 --- a/plasma/dataengines/favicons/CMakeLists.txt +++ b/plasma/dataengines/favicons/CMakeLists.txt @@ -6,7 +6,7 @@ set(favicons_engine_SRCS kde4_add_plugin(plasma_engine_favicons ${favicons_engine_SRCS} ) target_link_libraries(plasma_engine_favicons ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_engine_favicons DESTINATION ${PLUGIN_INSTALL_DIR} ) -install(FILES plasma-dataengine-favicons.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 528414f4..772d7b51 100644 --- a/plasma/dataengines/filebrowser/CMakeLists.txt +++ b/plasma/dataengines/filebrowser/CMakeLists.txt @@ -5,6 +5,6 @@ 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}) -install(TARGETS plasma_engine_filebrowser DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-filebrowser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 3125cdb0..bc93e4cf 100644 --- a/plasma/dataengines/geolocation/CMakeLists.txt +++ b/plasma/dataengines/geolocation/CMakeLists.txt @@ -14,11 +14,11 @@ set_target_properties(plasma-geolocation-interface PROPERTIES install(TARGETS plasma-geolocation-interface ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES geolocationprovider.h geolocation_export.h - DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/geolocation + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/geolocation COMPONENT Devel) #install(FILES includes/Interface -# DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma/Geolocation +# DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma/Geolocation # COMPONENT Devel) # ------------------------------------------------------------------------------------------------- @@ -31,17 +31,17 @@ target_link_libraries(plasma_engine_geolocation ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS plasma_engine_geolocation DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-geolocation.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES plasma-geolocationprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(TARGETS plasma_engine_geolocation DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-geolocation.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES plasma-geolocationprovider.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) # ------------------------------------------------------------------------------------------------- set(plasma_geolocation_ip_SRCS location_ip.cpp) kde4_add_plugin(plasma-geolocation-ip ${plasma_geolocation_ip_SRCS}) target_link_libraries(plasma-geolocation-ip plasma-geolocation-interface) -install(FILES plasma-geolocation-ip.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS plasma-geolocation-ip DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES plasma-geolocation-ip.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS plasma-geolocation-ip DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) # ------------------------------------------------------------------------------------------------- @@ -50,8 +50,8 @@ if(LIBGPS_FOUND) set(plasma_geolocation_gps_SRCS location_gps.cpp) kde4_add_plugin(plasma-geolocation-gps ${plasma_geolocation_gps_SRCS}) target_link_libraries(plasma-geolocation-gps plasma-geolocation-interface ${LIBGPS_LIBRARIES}) - install(FILES plasma-geolocation-gps.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - install(TARGETS plasma-geolocation-gps DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES plasma-geolocation-gps.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) + install(TARGETS plasma-geolocation-gps DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(LIBGPS_FOUND) # ------------------------------------------------------------------------------------------------- diff --git a/plasma/dataengines/hotplug/CMakeLists.txt b/plasma/dataengines/hotplug/CMakeLists.txt index bc94e1be..31e5f656 100644 --- a/plasma/dataengines/hotplug/CMakeLists.txt +++ b/plasma/dataengines/hotplug/CMakeLists.txt @@ -7,6 +7,6 @@ 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}) -install(TARGETS plasma_engine_hotplug DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-hotplug.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES hotplug.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services ) +install(TARGETS plasma_engine_hotplug DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-hotplug.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES hotplug.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services ) diff --git a/plasma/dataengines/keystate/CMakeLists.txt b/plasma/dataengines/keystate/CMakeLists.txt index 3f921737..9eeb9536 100644 --- a/plasma/dataengines/keystate/CMakeLists.txt +++ b/plasma/dataengines/keystate/CMakeLists.txt @@ -6,7 +6,7 @@ set(keystate_engine_SRCS kde4_add_plugin(plasma_engine_keystate ${keystate_engine_SRCS}) target_link_libraries(plasma_engine_keystate ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_engine_keystate DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-keystate.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES modifierkeystate.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_keystate DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-keystate.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES modifierkeystate.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/mouse/CMakeLists.txt b/plasma/dataengines/mouse/CMakeLists.txt index 86d7accb..ff77759a 100644 --- a/plasma/dataengines/mouse/CMakeLists.txt +++ b/plasma/dataengines/mouse/CMakeLists.txt @@ -14,6 +14,6 @@ if (X11_Xfixes_FOUND) target_link_libraries(plasma_engine_mouse ${X11_Xfixes_LIB}) endif (X11_Xfixes_FOUND) -install(TARGETS plasma_engine_mouse DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-mouse.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS plasma_engine_mouse DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-mouse.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/mpris2/CMakeLists.txt b/plasma/dataengines/mpris2/CMakeLists.txt index 310ce7dd..a5d1d296 100644 --- a/plasma/dataengines/mpris2/CMakeLists.txt +++ b/plasma/dataengines/mpris2/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(plasma_engine_mpris2 ${KDE4_PLASMA_LIBS} ) -install(TARGETS plasma_engine_mpris2 DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-mpris2.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES mpris2.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_mpris2 DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-mpris2.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES mpris2.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/network/CMakeLists.txt b/plasma/dataengines/network/CMakeLists.txt index 9e3272fd..a69ad2e5 100644 --- a/plasma/dataengines/network/CMakeLists.txt +++ b/plasma/dataengines/network/CMakeLists.txt @@ -5,6 +5,6 @@ set(network_engine_SRCS kde4_add_plugin(plasma_engine_network ${network_engine_SRCS}) target_link_libraries(plasma_engine_network ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} solidcontrol) -install(TARGETS plasma_engine_network DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-network.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS plasma_engine_network DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-network.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/plasma/dataengines/notifications/CMakeLists.txt b/plasma/dataengines/notifications/CMakeLists.txt index cf349715..4930900e 100644 --- a/plasma/dataengines/notifications/CMakeLists.txt +++ b/plasma/dataengines/notifications/CMakeLists.txt @@ -10,6 +10,6 @@ kde4_add_plugin(plasma_engine_notifications ${notifications_engine_SRCS}) target_link_libraries(plasma_engine_notifications ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KNOTIFYCONFIG_LIBRARY}) -install(TARGETS plasma_engine_notifications DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-notifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES notifications.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_notifications DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-notifications.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES notifications.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/nowplaying/CMakeLists.txt b/plasma/dataengines/nowplaying/CMakeLists.txt index 6e1b8c57..4b035f97 100644 --- a/plasma/dataengines/nowplaying/CMakeLists.txt +++ b/plasma/dataengines/nowplaying/CMakeLists.txt @@ -50,7 +50,7 @@ if(XMMS_FOUND) target_link_libraries(plasma_engine_nowplaying ${XMMS_LDFLAGS}) endif(XMMS_FOUND) -install(TARGETS plasma_engine_nowplaying DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-nowplaying.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES nowplaying.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_nowplaying DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-nowplaying.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES nowplaying.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/places/CMakeLists.txt b/plasma/dataengines/places/CMakeLists.txt index d222eaed..728a7934 100644 --- a/plasma/dataengines/places/CMakeLists.txt +++ b/plasma/dataengines/places/CMakeLists.txt @@ -14,9 +14,9 @@ target_link_libraries(plasma_engine_places ) install(TARGETS plasma_engine_places - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-places.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install(FILES org.kde.places.operations - DESTINATION ${DATA_INSTALL_DIR}/plasma/services ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services ) diff --git a/plasma/dataengines/powermanagement/CMakeLists.txt b/plasma/dataengines/powermanagement/CMakeLists.txt index e13e0192..6e222676 100644 --- a/plasma/dataengines/powermanagement/CMakeLists.txt +++ b/plasma/dataengines/powermanagement/CMakeLists.txt @@ -11,7 +11,7 @@ QT4_ADD_DBUS_INTERFACE(powermanagement_engine_SRCS ${krunner_xml} krunner_interf 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_LIBRARY} kworkspace) -install(TARGETS plasma_engine_powermanagement DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-powermanagement.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES powermanagementservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_powermanagement DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-powermanagement.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES powermanagementservice.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/share/CMakeLists.txt b/plasma/dataengines/share/CMakeLists.txt index c3849ef1..08dbe709 100644 --- a/plasma/dataengines/share/CMakeLists.txt +++ b/plasma/dataengines/share/CMakeLists.txt @@ -13,16 +13,16 @@ target_link_libraries(plasma_engine_share ${KDE4_KIO_LIBS}) install(TARGETS plasma_engine_share - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES data/plasma-dataengine-share.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES data/plasma_shareprovider.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) install(FILES share.operations - DESTINATION ${DATA_INSTALL_DIR}/plasma/services) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) set(sharepackage_SRCS share_package.cpp @@ -37,6 +37,6 @@ target_link_libraries(plasma_packagestructure_share ${KDE4_PLASMA_LIBS}) install(TARGETS plasma_packagestructure_share - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES data/plasma-packagestructure-share.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/share/backends/im9/CMakeLists.txt b/plasma/dataengines/share/backends/im9/CMakeLists.txt index a4f4c574..885d222b 100644 --- a/plasma/dataengines/share/backends/im9/CMakeLists.txt +++ b/plasma/dataengines/share/backends/im9/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-im9.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-im9.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-im9.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/im9/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/im9/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/im9) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/im9) diff --git a/plasma/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt b/plasma/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt index a4cfe41b..5810f966 100644 --- a/plasma/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt +++ b/plasma/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-imgsusepasteorg.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-imgsusepasteorg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-imgsusepasteorg.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/imgsusepasteorg) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/imgsusepasteorg) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/imgsusepasteorg) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/imgsusepasteorg) diff --git a/plasma/dataengines/share/backends/imgur/CMakeLists.txt b/plasma/dataengines/share/backends/imgur/CMakeLists.txt index e71a1b43..b33a9e2f 100644 --- a/plasma/dataengines/share/backends/imgur/CMakeLists.txt +++ b/plasma/dataengines/share/backends/imgur/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-imgur.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-imgur.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-imgur.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/imgur/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/imgur/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/imgur) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/imgur) diff --git a/plasma/dataengines/share/backends/kde/CMakeLists.txt b/plasma/dataengines/share/backends/kde/CMakeLists.txt index 8f323451..09759b7a 100644 --- a/plasma/dataengines/share/backends/kde/CMakeLists.txt +++ b/plasma/dataengines/share/backends/kde/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-kde.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-kde.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-kde.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/kde/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/kde/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/kde) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/kde) diff --git a/plasma/dataengines/share/backends/pastebincom/CMakeLists.txt b/plasma/dataengines/share/backends/pastebincom/CMakeLists.txt index 308f8030..27bc11a3 100644 --- a/plasma/dataengines/share/backends/pastebincom/CMakeLists.txt +++ b/plasma/dataengines/share/backends/pastebincom/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pastebincom.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pastebincom.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pastebincom.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/pastebincom/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/pastebincom/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/pastebincom) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/pastebincom) diff --git a/plasma/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt b/plasma/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt index f2e6a93e..d397eb19 100644 --- a/plasma/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt +++ b/plasma/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pasteopensuseorg.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pasteopensuseorg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pasteopensuseorg.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/pasteopensuseorg) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/pasteopensuseorg) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/pasteopensuseorg) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/pasteopensuseorg) diff --git a/plasma/dataengines/share/backends/pasteubuntucom/CMakeLists.txt b/plasma/dataengines/share/backends/pasteubuntucom/CMakeLists.txt index 294f20d9..1e2dc4be 100644 --- a/plasma/dataengines/share/backends/pasteubuntucom/CMakeLists.txt +++ b/plasma/dataengines/share/backends/pasteubuntucom/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pasteubuntucom.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pasteubuntucom.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-pasteubuntucom.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/pasteubuntucom) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/pasteubuntucom) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/pasteubuntucom) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/pasteubuntucom) diff --git a/plasma/dataengines/share/backends/privatepaste/CMakeLists.txt b/plasma/dataengines/share/backends/privatepaste/CMakeLists.txt index 4dbbb3e9..2553645b 100644 --- a/plasma/dataengines/share/backends/privatepaste/CMakeLists.txt +++ b/plasma/dataengines/share/backends/privatepaste/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-privatepastecom.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-privatepastecom.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-privatepastecom.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/privatepastecom) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/privatepastecom) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/privatepastecom) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/privatepastecom) diff --git a/plasma/dataengines/share/backends/simplestimagehosting/CMakeLists.txt b/plasma/dataengines/share/backends/simplestimagehosting/CMakeLists.txt index a7961fb0..a3710303 100644 --- a/plasma/dataengines/share/backends/simplestimagehosting/CMakeLists.txt +++ b/plasma/dataengines/share/backends/simplestimagehosting/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-simplestimagehosting.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-simplestimagehosting.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-simplestimagehosting.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/simplestimagehosting/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/simplestimagehosting/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/simplestimagehosting) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/simplestimagehosting) diff --git a/plasma/dataengines/share/backends/wklej/CMakeLists.txt b/plasma/dataengines/share/backends/wklej/CMakeLists.txt index 06344690..c0d6b56b 100644 --- a/plasma/dataengines/share/backends/wklej/CMakeLists.txt +++ b/plasma/dataengines/share/backends/wklej/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-wklej.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-wklej.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-wklej.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/wklej/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/wklej/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/wklej) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/wklej) diff --git a/plasma/dataengines/share/backends/wstaw/CMakeLists.txt b/plasma/dataengines/share/backends/wstaw/CMakeLists.txt index 3a31a16f..a02be1e8 100644 --- a/plasma/dataengines/share/backends/wstaw/CMakeLists.txt +++ b/plasma/dataengines/share/backends/wstaw/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/metadata.desktop ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-wstaw.desktop COPYONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-wstaw.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-share-addon-wstaw.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/wstaw/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/wstaw/) install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/plasma/shareprovider/wstaw) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/shareprovider/wstaw) diff --git a/plasma/dataengines/soliddevice/CMakeLists.txt b/plasma/dataengines/soliddevice/CMakeLists.txt index 7e0ff39b..b0187ea9 100644 --- a/plasma/dataengines/soliddevice/CMakeLists.txt +++ b/plasma/dataengines/soliddevice/CMakeLists.txt @@ -10,7 +10,7 @@ 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} ${QT_QTNETWORK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBRARY}) -install(TARGETS plasma_engine_soliddevice DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-soliddevice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES soliddevice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services ) +install(TARGETS plasma_engine_soliddevice DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-soliddevice.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES soliddevice.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services ) diff --git a/plasma/dataengines/statusnotifieritem/CMakeLists.txt b/plasma/dataengines/statusnotifieritem/CMakeLists.txt index c034f772..29d6c8ae 100644 --- a/plasma/dataengines/statusnotifieritem/CMakeLists.txt +++ b/plasma/dataengines/statusnotifieritem/CMakeLists.txt @@ -27,7 +27,7 @@ QT4_ADD_DBUS_INTERFACE(statusnotifieritem_engine_SRCS ${statusnotifieritem_xml} kde4_add_plugin(plasma_engine_statusnotifieritem ${statusnotifieritem_engine_SRCS}) target_link_libraries(plasma_engine_statusnotifieritem ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${DBUSMENUQT_LIBRARIES}) -install(TARGETS plasma_engine_statusnotifieritem DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma_engine_statusnotifieritem.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES statusnotifieritem.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_statusnotifieritem DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma_engine_statusnotifieritem.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES statusnotifieritem.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/systemmonitor/CMakeLists.txt b/plasma/dataengines/systemmonitor/CMakeLists.txt index b9bf5569..c3e80a10 100644 --- a/plasma/dataengines/systemmonitor/CMakeLists.txt +++ b/plasma/dataengines/systemmonitor/CMakeLists.txt @@ -6,8 +6,8 @@ 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) -install(TARGETS plasma_engine_systemmonitor DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-systemmonitor.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 ac9465c5..21c0cd13 100644 --- a/plasma/dataengines/tasks/CMakeLists.txt +++ b/plasma/dataengines/tasks/CMakeLists.txt @@ -9,6 +9,6 @@ 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} taskmanager) -install(TARGETS plasma_engine_tasks DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-tasks.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES tasks.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_tasks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-tasks.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES tasks.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/plasma/dataengines/time/CMakeLists.txt b/plasma/dataengines/time/CMakeLists.txt index ebfc04c8..72fc405d 100644 --- a/plasma/dataengines/time/CMakeLists.txt +++ b/plasma/dataengines/time/CMakeLists.txt @@ -7,6 +7,6 @@ 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}) -install(TARGETS plasma_engine_time DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-time.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +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 57038a51..846f48a5 100644 --- a/plasma/dataengines/weather/CMakeLists.txt +++ b/plasma/dataengines/weather/CMakeLists.txt @@ -3,5 +3,5 @@ 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 ${PLUGIN_INSTALL_DIR}) -INSTALL (FILES plasma-dataengine-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 2c381bc0..806abd3a 100644 --- a/plasma/dataengines/weather/ions/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/CMakeLists.txt @@ -13,10 +13,10 @@ install (TARGETS weather_ion EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS INSTALL (FILES ion.h ion_export.h - DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/weather COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/weather COMPONENT Devel) INSTALL (FILES includes/Ion - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma/Weather COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma/Weather COMPONENT Devel) # the individual ion plugins add_subdirectory(bbcukmet) diff --git a/plasma/dataengines/weather/ions/bbcukmet/CMakeLists.txt b/plasma/dataengines/weather/ions/bbcukmet/CMakeLists.txt index 476260c0..8c91c663 100644 --- a/plasma/dataengines/weather/ions/bbcukmet/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/bbcukmet/CMakeLists.txt @@ -2,7 +2,7 @@ SET (ion_bbcukmet_SRCS ion_bbcukmet.cpp) kde4_add_plugin(ion_bbcukmet ${ion_bbcukmet_SRCS}) target_link_libraries (ion_bbcukmet ${KDE4_SOLID_LIBS} weather_ion) -INSTALL (FILES ion-bbcukmet.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +INSTALL (FILES ion-bbcukmet.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -INSTALL (TARGETS ion_bbcukmet DESTINATION ${PLUGIN_INSTALL_DIR}) +INSTALL (TARGETS ion_bbcukmet DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/dataengines/weather/ions/debianweather/CMakeLists.txt b/plasma/dataengines/weather/ions/debianweather/CMakeLists.txt index 5a36888c..e32782ee 100644 --- a/plasma/dataengines/weather/ions/debianweather/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/debianweather/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(ion_debianweather weather_ion ${QT_QTCORE_LIBRARY}) install(TARGETS ion_debianweather - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES ion-debianweather.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/dataengines/weather/ions/envcan/CMakeLists.txt b/plasma/dataengines/weather/ions/envcan/CMakeLists.txt index cb10a30d..b2a7bf29 100644 --- a/plasma/dataengines/weather/ions/envcan/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/envcan/CMakeLists.txt @@ -2,7 +2,7 @@ SET (ion_envcan_SRCS ion_envcan.cpp) kde4_add_plugin(ion_envcan ${ion_envcan_SRCS}) target_link_libraries (ion_envcan ${KDE4_SOLID_LIBS} weather_ion) -INSTALL (FILES ion-envcan.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +INSTALL (FILES ion-envcan.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -INSTALL (TARGETS ion_envcan DESTINATION ${PLUGIN_INSTALL_DIR}) +INSTALL (TARGETS ion_envcan DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/dataengines/weather/ions/noaa/CMakeLists.txt b/plasma/dataengines/weather/ions/noaa/CMakeLists.txt index 72dd2cf0..f08a27e9 100644 --- a/plasma/dataengines/weather/ions/noaa/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/noaa/CMakeLists.txt @@ -2,7 +2,7 @@ SET (ion_noaa_SRCS ion_noaa.cpp) kde4_add_plugin(ion_noaa ${ion_noaa_SRCS}) target_link_libraries (ion_noaa ${KDE4_SOLID_LIBS} weather_ion) -INSTALL (FILES ion-noaa.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +INSTALL (FILES ion-noaa.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -INSTALL (TARGETS ion_noaa DESTINATION ${PLUGIN_INSTALL_DIR}) +INSTALL (TARGETS ion_noaa DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt b/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt index 87383810..15e491dc 100644 --- a/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt +++ b/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt @@ -2,6 +2,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} ${KDE4_KUNITCONVERSION_LIBS}) -install(FILES ion-wettercom.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS ion_wettercom DESTINATION ${PLUGIN_INSTALL_DIR}) +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 de6f2453..45d5a64a 100644 --- a/plasma/declarativeimports/core/CMakeLists.txt +++ b/plasma/declarativeimports/core/CMakeLists.txt @@ -31,8 +31,8 @@ target_link_libraries(corebindingsplugin ${QT_QTDECLARATIVE_LIBRARY} ) -install(TARGETS corebindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/core) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/core) +install(TARGETS corebindingsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/core) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/core) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/plasma/declarativeimports/dirmodel/CMakeLists.txt b/plasma/declarativeimports/dirmodel/CMakeLists.txt index 3c6e4daf..0d342d46 100644 --- a/plasma/declarativeimports/dirmodel/CMakeLists.txt +++ b/plasma/declarativeimports/dirmodel/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(dirmodelplugin ${KDE4_KIO_LIBS} ) -install(TARGETS dirmodelplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/dirmodel) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/dirmodel) +install(TARGETS dirmodelplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/dirmodel) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/dirmodel) #add_subdirectory(test) diff --git a/plasma/declarativeimports/draganddrop/CMakeLists.txt b/plasma/declarativeimports/draganddrop/CMakeLists.txt index 965e1bdf..e4b7f676 100644 --- a/plasma/declarativeimports/draganddrop/CMakeLists.txt +++ b/plasma/declarativeimports/draganddrop/CMakeLists.txt @@ -17,6 +17,6 @@ INCLUDE_DIRECTORIES( add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS}) target_link_libraries(draganddropplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) -install(TARGETS draganddropplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/draganddrop) +install(TARGETS draganddropplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/draganddrop) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/draganddrop) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/draganddrop) diff --git a/plasma/declarativeimports/graphicslayouts/CMakeLists.txt b/plasma/declarativeimports/graphicslayouts/CMakeLists.txt index febd88d4..3cb5a571 100644 --- a/plasma/declarativeimports/graphicslayouts/CMakeLists.txt +++ b/plasma/declarativeimports/graphicslayouts/CMakeLists.txt @@ -15,5 +15,5 @@ include_directories( add_library(graphicslayoutsbindingsplugin SHARED ${graphicslayoutsbindings_SRCS}) target_link_libraries(graphicslayoutsbindingsplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) -install(TARGETS graphicslayoutsbindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicslayouts) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicslayouts) +install(TARGETS graphicslayoutsbindingsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicslayouts) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicslayouts) diff --git a/plasma/declarativeimports/graphicswidgets/CMakeLists.txt b/plasma/declarativeimports/graphicswidgets/CMakeLists.txt index 85d4c472..c818d3da 100644 --- a/plasma/declarativeimports/graphicswidgets/CMakeLists.txt +++ b/plasma/declarativeimports/graphicswidgets/CMakeLists.txt @@ -20,9 +20,9 @@ target_link_libraries(graphicswidgetsbindingsplugin install( TARGETS graphicswidgetsbindingsplugin - DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicswidgets + DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicswidgets ) install( FILES qmldir - DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicswidgets + DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicswidgets ) diff --git a/plasma/declarativeimports/krunnermodel/CMakeLists.txt b/plasma/declarativeimports/krunnermodel/CMakeLists.txt index 1abb182f..ad42275f 100644 --- a/plasma/declarativeimports/krunnermodel/CMakeLists.txt +++ b/plasma/declarativeimports/krunnermodel/CMakeLists.txt @@ -12,6 +12,6 @@ target_link_libraries(runnermodelplugin ${KDE4_PLASMA_LIBS} ) -install(TARGETS runnermodelplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/runnermodel) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/runnermodel) +install(TARGETS runnermodelplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/runnermodel) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/runnermodel) diff --git a/plasma/declarativeimports/locale/CMakeLists.txt b/plasma/declarativeimports/locale/CMakeLists.txt index d23f0701..c1b62f2d 100644 --- a/plasma/declarativeimports/locale/CMakeLists.txt +++ b/plasma/declarativeimports/locale/CMakeLists.txt @@ -16,5 +16,5 @@ add_library(localebindingsplugin SHARED ${localebindings_SRCS}) target_link_libraries(localebindingsplugin ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDECORE_LIBRARY}) -install(TARGETS localebindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/locale) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/locale) +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 2c087649..6a9a7cf8 100644 --- a/plasma/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/plasma/declarativeimports/plasmacomponents/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(plasmacomponentsplugin ${KDE4_PLASMA_LIBS} ) -install(TARGETS plasmacomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/components) +install(TARGETS plasmacomponentsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/components) -install(DIRECTORY qml/ DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/components) +install(DIRECTORY qml/ DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/components) diff --git a/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt b/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt index ff0a73f9..bdaabf9f 100644 --- a/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt +++ b/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt @@ -10,6 +10,6 @@ add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS}) target_link_libraries(plasmaextracomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_PLASMA_LIBS} ) -install(TARGETS plasmaextracomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/extras) +install(TARGETS plasmaextracomponentsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/extras) -install(DIRECTORY qml/ DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/extras) +install(DIRECTORY qml/ DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/plasma/extras) diff --git a/plasma/declarativeimports/qtextracomponents/CMakeLists.txt b/plasma/declarativeimports/qtextracomponents/CMakeLists.txt index b876a699..c7659e37 100644 --- a/plasma/declarativeimports/qtextracomponents/CMakeLists.txt +++ b/plasma/declarativeimports/qtextracomponents/CMakeLists.txt @@ -22,6 +22,6 @@ INCLUDE_DIRECTORIES( add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS}) target_link_libraries(qtextracomponentsplugin ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) -install(TARGETS qtextracomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) +install(TARGETS qtextracomponentsplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) diff --git a/plasma/desktoptheme/air-netbook/CMakeLists.txt b/plasma/desktoptheme/air-netbook/CMakeLists.txt index a4216bbe..e7ed1d7e 100644 --- a/plasma/desktoptheme/air-netbook/CMakeLists.txt +++ b/plasma/desktoptheme/air-netbook/CMakeLists.txt @@ -1,6 +1,6 @@ -install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air-netbook/) +install(FILES colors metadata.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/air-netbook/) FILE(GLOB widgets widgets/*.svgz) -install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air-netbook/widgets/ ) +install( FILES ${widgets} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/air-netbook/widgets/ ) diff --git a/plasma/desktoptheme/air/CMakeLists.txt b/plasma/desktoptheme/air/CMakeLists.txt index 77ff6696..aada6812 100644 --- a/plasma/desktoptheme/air/CMakeLists.txt +++ b/plasma/desktoptheme/air/CMakeLists.txt @@ -1,26 +1,26 @@ -install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/) +install(FILES colors metadata.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/) FILE(GLOB widgets widgets/*.svgz) -install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/ ) +install( FILES ${widgets} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/ ) FILE(GLOB dialogs dialogs/*.svgz) -install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/dialogs/ ) +install( FILES ${dialogs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/dialogs/ ) FILE(GLOB opaque_dialogs opaque/dialogs/*.svgz) -install( FILES ${opaque_dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/dialogs/ ) +install( FILES ${opaque_dialogs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/opaque/dialogs/ ) FILE(GLOB opaque_widgets opaque/widgets/*.svgz) -install( FILES ${opaque_widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/widgets/ ) +install( FILES ${opaque_widgets} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/opaque/widgets/ ) FILE(GLOB translucent_widgets translucent/widgets/*.svgz) -install( FILES ${translucent_widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/translucent/widgets/ ) +install( FILES ${translucent_widgets} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/translucent/widgets/ ) FILE(GLOB translucent_dialogs translucent/dialogs/*.svgz) -install( FILES ${translucent_dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/translucent/dialogs/ ) +install( FILES ${translucent_dialogs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/translucent/dialogs/ ) FILE(GLOB icons icons/*.svgz) -install( FILES ${icons} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/icons/ ) +install( FILES ${icons} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/icons/ ) FILE(GLOB icons toolbar-icons/*.svgz) -install( FILES ${icons} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/toolbar-icons/ ) +install( FILES ${icons} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/toolbar-icons/ ) diff --git a/plasma/desktoptheme/appdashboard/CMakeLists.txt b/plasma/desktoptheme/appdashboard/CMakeLists.txt index 5b793351..b17668e7 100644 --- a/plasma/desktoptheme/appdashboard/CMakeLists.txt +++ b/plasma/desktoptheme/appdashboard/CMakeLists.txt @@ -1,7 +1,7 @@ -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/appdashboard/) +install(FILES metadata.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/appdashboard/) FILE(GLOB widgets widgets/*.svgz) -install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/appdashboard/widgets/ ) +install( FILES ${widgets} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/appdashboard/widgets/ ) diff --git a/plasma/desktoptheme/oxygen/CMakeLists.txt b/plasma/desktoptheme/oxygen/CMakeLists.txt index ee38e58e..27feb248 100644 --- a/plasma/desktoptheme/oxygen/CMakeLists.txt +++ b/plasma/desktoptheme/oxygen/CMakeLists.txt @@ -1,15 +1,15 @@ -install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/) +install(FILES colors metadata.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/) FILE(GLOB widgets widgets/*.svgz) -install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/widgets/ ) +install( FILES ${widgets} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/widgets/ ) FILE(GLOB dialogs dialogs/*.svgz) -install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/dialogs/ ) +install( FILES ${dialogs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/dialogs/ ) FILE(GLOB opaque opaque/widgets/*.svgz) -install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/opaque/widgets/ ) +install( FILES ${opaque} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/opaque/widgets/ ) FILE(GLOB opaque opaque/dialogs/*.svgz) -install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/opaque/dialogs/ ) +install( FILES ${opaque} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/opaque/dialogs/ ) diff --git a/plasma/kpart/CMakeLists.txt b/plasma/kpart/CMakeLists.txt index 50049299..0b7c96e9 100644 --- a/plasma/kpart/CMakeLists.txt +++ b/plasma/kpart/CMakeLists.txt @@ -16,6 +16,6 @@ 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} ) -install(TARGETS plasma-kpart DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-kpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 cf8d1569..9c9b17eb 100644 --- a/plasma/runners/bookmarks/CMakeLists.txt +++ b/plasma/runners/bookmarks/CMakeLists.txt @@ -22,11 +22,11 @@ target_link_libraries(krunner_bookmarksrunner ${QT_QTSQL_LIBRARY} ) -install(TARGETS krunner_bookmarksrunner DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_bookmarksrunner DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install(FILES plasma-runner-bookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-bookmarks.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/plasma/runners/calculator/CMakeLists.txt b/plasma/runners/calculator/CMakeLists.txt index e1ed4fd0..31747384 100644 --- a/plasma/runners/calculator/CMakeLists.txt +++ b/plasma/runners/calculator/CMakeLists.txt @@ -29,7 +29,7 @@ else ( QALCULATE_FOUND ) target_link_libraries(krunner_calculatorrunner ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${KDE4_PLASMA_LIBS}) endif ( QALCULATE_FOUND ) -install(TARGETS krunner_calculatorrunner DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_calculatorrunner DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install(FILES plasma-runner-calculator.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-calculator.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/kill/CMakeLists.txt b/plasma/runners/kill/CMakeLists.txt index 7d2673ae..744c73f3 100644 --- a/plasma/runners/kill/CMakeLists.txt +++ b/plasma/runners/kill/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(krunner_kill add_dependencies(krunner_kill kcm_krunner_kill) install(TARGETS krunner_kill kcm_krunner_kill - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-runner-kill.desktop plasma-runner-kill_config.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/locations/CMakeLists.txt b/plasma/runners/locations/CMakeLists.txt index 4cb3d2a5..c947e826 100644 --- a/plasma/runners/locations/CMakeLists.txt +++ b/plasma/runners/locations/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_locations_SRCS kde4_add_plugin(krunner_locations ${krunner_locations_SRCS}) target_link_libraries(krunner_locations ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_locations DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_locations DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-locations.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-locations.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/places/CMakeLists.txt b/plasma/runners/places/CMakeLists.txt index 8b0960e0..19fb1ec8 100644 --- a/plasma/runners/places/CMakeLists.txt +++ b/plasma/runners/places/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries( ${KDE4_PLASMA_LIBS} ) -install(TARGETS krunner_placesrunner DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_placesrunner DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-places.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-places.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/plasma-desktop/CMakeLists.txt b/plasma/runners/plasma-desktop/CMakeLists.txt index 9a96b8fc..2c138572 100644 --- a/plasma/runners/plasma-desktop/CMakeLists.txt +++ b/plasma/runners/plasma-desktop/CMakeLists.txt @@ -5,6 +5,6 @@ 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}) -install(TARGETS krunner_plasma-desktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-plasma-desktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 d1901be5..e48a8b8d 100644 --- a/plasma/runners/powerdevil/CMakeLists.txt +++ b/plasma/runners/powerdevil/CMakeLists.txt @@ -9,7 +9,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}) -install(TARGETS krunner_powerdevil DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS krunner_powerdevil DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-powerdevil.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-powerdevil.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/recentdocuments/CMakeLists.txt b/plasma/runners/recentdocuments/CMakeLists.txt index df24f655..18880de8 100644 --- a/plasma/runners/recentdocuments/CMakeLists.txt +++ b/plasma/runners/recentdocuments/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_recentdocuments_SRCS kde4_add_plugin(krunner_recentdocuments ${krunner_recentdocuments_SRCS}) target_link_libraries(krunner_recentdocuments ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS krunner_recentdocuments DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_recentdocuments DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES recentdocuments.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES recentdocuments.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/services/CMakeLists.txt b/plasma/runners/services/CMakeLists.txt index 052cc2c0..87143afc 100644 --- a/plasma/runners/services/CMakeLists.txt +++ b/plasma/runners/services/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_services_SRCS kde4_add_plugin(krunner_services ${krunner_services_SRCS}) target_link_libraries(krunner_services ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_services DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_services DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-services.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-services.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/sessions/CMakeLists.txt b/plasma/runners/sessions/CMakeLists.txt index 67d9920a..b93366f5 100644 --- a/plasma/runners/sessions/CMakeLists.txt +++ b/plasma/runners/sessions/CMakeLists.txt @@ -8,7 +8,7 @@ QT4_ADD_DBUS_INTERFACE(krunner_sessions_SRCS ${screensaver_xml} screensaver_inte kde4_add_plugin(krunner_sessions ${krunner_sessions_SRCS}) target_link_libraries(krunner_sessions ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} kworkspace) -install(TARGETS krunner_sessions DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_sessions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-sessions.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-sessions.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/shell/CMakeLists.txt b/plasma/runners/shell/CMakeLists.txt index d5f5a516..a32d68d9 100644 --- a/plasma/runners/shell/CMakeLists.txt +++ b/plasma/runners/shell/CMakeLists.txt @@ -6,6 +6,6 @@ set(krunner_shell_SRCS kde4_add_plugin(krunner_shell ${krunner_shell_SRCS}) target_link_libraries(krunner_shell ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_shell DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-shell.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 4b17c3d9..6e0e6c3c 100644 --- a/plasma/runners/solid/CMakeLists.txt +++ b/plasma/runners/solid/CMakeLists.txt @@ -6,6 +6,6 @@ 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}) -install(TARGETS krunner_solid DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_solid DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-solid.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-solid.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/webshortcuts/CMakeLists.txt b/plasma/runners/webshortcuts/CMakeLists.txt index a6da726d..44c7d7e4 100644 --- a/plasma/runners/webshortcuts/CMakeLists.txt +++ b/plasma/runners/webshortcuts/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_webshortcuts_SRCS kde4_add_plugin(krunner_webshortcuts ${krunner_webshortcuts_SRCS}) target_link_libraries(krunner_webshortcuts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_webshortcuts DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_webshortcuts DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-webshortcuts.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-webshortcuts.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/runners/windowedwidgets/CMakeLists.txt b/plasma/runners/windowedwidgets/CMakeLists.txt index f17376c7..bbbd3836 100644 --- a/plasma/runners/windowedwidgets/CMakeLists.txt +++ b/plasma/runners/windowedwidgets/CMakeLists.txt @@ -9,5 +9,5 @@ set(krunner_windowedwidgets_SRCS kde4_add_plugin(krunner_windowedwidgets ${krunner_windowedwidgets_SRCS}) target_link_libraries(krunner_windowedwidgets ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_windowedwidgets DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-windowedwidgets.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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 8bf9258e..f2302b04 100644 --- a/plasma/runners/windows/CMakeLists.txt +++ b/plasma/runners/windows/CMakeLists.txt @@ -5,6 +5,6 @@ set(krunner_windows_SRCS kde4_add_plugin(krunner_windows ${krunner_windows_SRCS}) target_link_libraries(krunner_windows ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_windows DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_windows DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES plasma-runner-windows.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-windows.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/scriptengine/CMakeLists.txt b/plasma/scriptengine/CMakeLists.txt index a29a8517..3eef2b65 100644 --- a/plasma/scriptengine/CMakeLists.txt +++ b/plasma/scriptengine/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(plasma_appletscript_declarative ) -install(TARGETS plasma_appletscript_declarative DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES data/plasma-scriptengine-applet-declarative.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_appletscript_declarative DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES data/plasma-scriptengine-applet-declarative.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/shells/plasma-desktop/CMakeLists.txt b/plasma/shells/plasma-desktop/CMakeLists.txt index e489f089..d57a4233 100644 --- a/plasma/shells/plasma-desktop/CMakeLists.txt +++ b/plasma/shells/plasma-desktop/CMakeLists.txt @@ -48,12 +48,12 @@ if(UNIX AND Q_WS_X11) endif(UNIX AND Q_WS_X11) install(TARGETS plasma-desktop ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES data/plasma.desktop data/plasma-desktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -install(FILES data/plasma-shell-desktop.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(FILES data/plasma-themes.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) -install(FILES data/plasma-desktop.notifyrc DESTINATION ${DATA_INSTALL_DIR}/plasma-desktop) -install(FILES data/plasma-desktop-js.xml DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax/) +install(FILES data/plasma.desktop 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-themes.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) +install(FILES data/plasma-desktop.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma-desktop) +install(FILES data/plasma-desktop-js.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/katepart/syntax/) install( FILES data/plasma-desktoprc - DESTINATION ${CONFIG_INSTALL_DIR} + DESTINATION ${KDE4_CONFIG_INSTALL_DIR} ) diff --git a/plasma/shells/plasma-overlay/CMakeLists.txt b/plasma/shells/plasma-overlay/CMakeLists.txt index 2d232079..43937303 100644 --- a/plasma/shells/plasma-overlay/CMakeLists.txt +++ b/plasma/shells/plasma-overlay/CMakeLists.txt @@ -35,4 +35,4 @@ endif(X11_Xrender_FOUND) set_target_properties(plasma-overlay PROPERTIES OUTPUT_NAME plasma-overlay) install(TARGETS plasma-overlay ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES plasma-overlayrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES plasma-overlayrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) diff --git a/plasma/toolboxes/CMakeLists.txt b/plasma/toolboxes/CMakeLists.txt index 63dc2645..f4e9b494 100644 --- a/plasma/toolboxes/CMakeLists.txt +++ b/plasma/toolboxes/CMakeLists.txt @@ -8,10 +8,10 @@ kde4_add_plugin(plasma_toolbox_desktoptoolbox ${desktoptoolbox_SRCS}) target_link_libraries(plasma_toolbox_desktoptoolbox ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} kworkspace) install(TARGETS plasma_toolbox_desktoptoolbox - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-toolbox-desktoptoolbox.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) set(desktoptoolbox_SRCS internaltoolbox.cpp desktoptoolbox.cpp) @@ -24,7 +24,7 @@ kde4_add_plugin(plasma_toolbox_paneltoolbox ${paneltoolbox_SRCS}) target_link_libraries(plasma_toolbox_paneltoolbox ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_toolbox_paneltoolbox - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-toolbox-paneltoolbox.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/plasma/wallpapers/color/CMakeLists.txt b/plasma/wallpapers/color/CMakeLists.txt index a962c857..d38a07ff 100644 --- a/plasma/wallpapers/color/CMakeLists.txt +++ b/plasma/wallpapers/color/CMakeLists.txt @@ -11,5 +11,5 @@ set(color_SRCS kde4_add_plugin(plasma_wallpaper_color ${color_SRCS}) target_link_libraries(plasma_wallpaper_color ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_wallpaper_color DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-color.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +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/data/CMakeLists.txt b/plasma/wallpapers/data/CMakeLists.txt index 5a75f3f0..2a844945 100644 --- a/plasma/wallpapers/data/CMakeLists.txt +++ b/plasma/wallpapers/data/CMakeLists.txt @@ -1,5 +1,5 @@ -install(DIRECTORY Ariya DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) +install(DIRECTORY Ariya DESTINATION ${KDE4_WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) -install(DIRECTORY Auros DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) +install(DIRECTORY Auros DESTINATION ${KDE4_WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) -install(DIRECTORY Elarun DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) +install(DIRECTORY Elarun DESTINATION ${KDE4_WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) diff --git a/plasma/wallpapers/image/CMakeLists.txt b/plasma/wallpapers/image/CMakeLists.txt index b94327da..7f65c8aa 100644 --- a/plasma/wallpapers/image/CMakeLists.txt +++ b/plasma/wallpapers/image/CMakeLists.txt @@ -15,7 +15,7 @@ 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}) -install(TARGETS plasma_wallpaper_image DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-image.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_image DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-image.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES wallpaper.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES wallpaper.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) diff --git a/polkit-kde-agent/CMakeLists.txt b/polkit-kde-agent/CMakeLists.txt index 2f6d0371..586b0563 100644 --- a/polkit-kde-agent/CMakeLists.txt +++ b/polkit-kde-agent/CMakeLists.txt @@ -34,7 +34,7 @@ configure_file( install( TARGETS polkit-kde-authentication-agent-1 - DESTINATION ${LIBEXEC_INSTALL_DIR} + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) install( @@ -44,5 +44,5 @@ install( install( FILES policykit1-kde.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/policykit1-kde + DESTINATION ${KDE4_DATA_INSTALL_DIR}/policykit1-kde ) diff --git a/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in b/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in index aa088cca..126c150d 100644 --- a/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in +++ b/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in @@ -16,7 +16,7 @@ Comment[pt]=Agente de Autenticação do PolicyKit Comment[sv]=Policykit behörighetskontrollverktyg Comment[uk]=Агент розпізнавання PolicyKit Comment[x-test]=xxPolicyKit Authentication Agentxx -Exec=${LIBEXEC_INSTALL_DIR}/polkit-kde-authentication-agent-1 +Exec=${KDE4_LIBEXEC_INSTALL_DIR}/polkit-kde-authentication-agent-1 Terminal=false Type=Application Categories= diff --git a/powerdevil/CMakeLists.txt b/powerdevil/CMakeLists.txt index 0bede398..8ddfad97 100644 --- a/powerdevil/CMakeLists.txt +++ b/powerdevil/CMakeLists.txt @@ -8,4 +8,4 @@ include_directories ( add_subdirectory(daemon) add_subdirectory(kcmodule) -install( FILES powerdevil.notifyrc DESTINATION ${DATA_INSTALL_DIR}/powerdevil ) +install( FILES powerdevil.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/powerdevil ) diff --git a/powerdevil/daemon/BackendConfig.cmake b/powerdevil/daemon/BackendConfig.cmake index f1d7be2a..89a803aa 100644 --- a/powerdevil/daemon/BackendConfig.cmake +++ b/powerdevil/daemon/BackendConfig.cmake @@ -44,7 +44,7 @@ if (UDEV_FOUND) ## backlight helper executable add_executable(backlighthelper backends/upower/backlighthelper.cpp ${backlighthelper_mocs}) target_link_libraries(backlighthelper ${KDE4_KDECORE_LIBS}) - install(TARGETS backlighthelper DESTINATION ${LIBEXEC_INSTALL_DIR}) + install(TARGETS backlighthelper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) kde4_install_auth_helper_files(backlighthelper org.kde.powerdevil.backlighthelper root) endif (UDEV_FOUND) diff --git a/powerdevil/daemon/CMakeLists.txt b/powerdevil/daemon/CMakeLists.txt index d88c2752..3aee9f09 100644 --- a/powerdevil/daemon/CMakeLists.txt +++ b/powerdevil/daemon/CMakeLists.txt @@ -84,7 +84,7 @@ if (UDEV_FOUND) target_link_libraries(kded_powerdevil ${UDEV_LIBS}) endif (UDEV_FOUND) -install(TARGETS kded_powerdevil DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_powerdevil DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(TARGETS powerdevilcore ${INSTALL_TARGETS_DEFAULT_ARGS}) # target no.3 - powerdevil ui library @@ -104,4 +104,4 @@ macro_bool_to_01(UDEV_FOUND HAVE_UDEV) configure_file(config-powerdevil.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-powerdevil.h ) install(TARGETS powerdevilui ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES powerdevil.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(FILES powerdevil.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/powerdevil/daemon/actions/CMakeLists.txt b/powerdevil/daemon/actions/CMakeLists.txt index db9ca479..d3676537 100644 --- a/powerdevil/daemon/actions/CMakeLists.txt +++ b/powerdevil/daemon/actions/CMakeLists.txt @@ -1,4 +1,4 @@ -install(FILES powerdevilaction.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES powerdevilaction.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) add_subdirectory(bundled) if(HAVE_DPMS) diff --git a/powerdevil/daemon/actions/bundled/CMakeLists.txt b/powerdevil/daemon/actions/bundled/CMakeLists.txt index d3470016..9f7f59fb 100644 --- a/powerdevil/daemon/actions/bundled/CMakeLists.txt +++ b/powerdevil/daemon/actions/bundled/CMakeLists.txt @@ -7,8 +7,8 @@ function(add_powerdevil_bundled_action _name) ${KDE4_KDEUI_LIBS} powerdevilui ${ARGN}) - install(TARGETS powerdevil${_name}action_config DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES powerdevil${_name}action.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(TARGETS powerdevil${_name}action_config DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) + install(FILES powerdevil${_name}action.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endfunction(add_powerdevil_bundled_action _name) add_powerdevil_bundled_action(brightnesscontrol) diff --git a/powerdevil/daemon/actions/dpms/CMakeLists.txt b/powerdevil/daemon/actions/dpms/CMakeLists.txt index 5a0b0e73..075b22cf 100644 --- a/powerdevil/daemon/actions/dpms/CMakeLists.txt +++ b/powerdevil/daemon/actions/dpms/CMakeLists.txt @@ -10,8 +10,8 @@ target_link_libraries(powerdevildpmsaction ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} powerdevilcore) -install(TARGETS powerdevildpmsaction DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES powerdevildpmsaction.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS powerdevildpmsaction DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES powerdevildpmsaction.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) # Action config set(dpmsconfig_SRCS powerdevildpmsactionconfig.cpp) @@ -21,4 +21,4 @@ target_link_libraries(powerdevildpmsaction_config ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} powerdevilui) -install(TARGETS powerdevildpmsaction_config DESTINATION ${PLUGIN_INSTALL_DIR}) \ No newline at end of file +install(TARGETS powerdevildpmsaction_config DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) \ No newline at end of file diff --git a/powerdevil/kcmodule/global/CMakeLists.txt b/powerdevil/kcmodule/global/CMakeLists.txt index ba90a75c..b774ad3c 100644 --- a/powerdevil/kcmodule/global/CMakeLists.txt +++ b/powerdevil/kcmodule/global/CMakeLists.txt @@ -17,5 +17,5 @@ target_link_libraries(kcm_powerdevilglobalconfig powerdevilconfigcommonprivate ) -install(TARGETS kcm_powerdevilglobalconfig DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES powerdevilglobalconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kcm_powerdevilglobalconfig DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES powerdevilglobalconfig.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/powerdevil/kcmodule/profiles/CMakeLists.txt b/powerdevil/kcmodule/profiles/CMakeLists.txt index 22878630..016e69df 100644 --- a/powerdevil/kcmodule/profiles/CMakeLists.txt +++ b/powerdevil/kcmodule/profiles/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(kcm_powerdevilprofilesconfig powerdevilconfigcommonprivate ) -install(TARGETS kcm_powerdevilprofilesconfig DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES powerdevilprofilesconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kcm_powerdevilprofilesconfig DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES powerdevilprofilesconfig.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/qguiplatformplugin_kde/CMakeLists.txt b/qguiplatformplugin_kde/CMakeLists.txt index 44301aa0..0bb68ec9 100644 --- a/qguiplatformplugin_kde/CMakeLists.txt +++ b/qguiplatformplugin_kde/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(libkde ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY}) install( TARGETS libkde LIBRARY - DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/gui_platform + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/gui_platform ) diff --git a/renamedlgplugins/audio/CMakeLists.txt b/renamedlgplugins/audio/CMakeLists.txt index 7943291d..ac5bc138 100644 --- a/renamedlgplugins/audio/CMakeLists.txt +++ b/renamedlgplugins/audio/CMakeLists.txt @@ -12,10 +12,10 @@ kde4_add_plugin(renaudioplugin WITH_PREFIX ${renaudioplugin_PART_SRCS}) target_link_libraries(renaudioplugin ${KDE4_KIO_LIBS} kmediaplayer ) -install(TARGETS renaudioplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS renaudioplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES renaudiodlg.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES renaudiodlg.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/renamedlgplugins/images/CMakeLists.txt b/renamedlgplugins/images/CMakeLists.txt index 9a791b5b..34c577f1 100644 --- a/renamedlgplugins/images/CMakeLists.txt +++ b/renamedlgplugins/images/CMakeLists.txt @@ -12,10 +12,10 @@ kde4_add_plugin(renimageplugin WITH_PREFIX ${renimageplugin_PART_SRCS}) target_link_libraries(renimageplugin ${KDE4_KIO_LIBS} ) -install(TARGETS renimageplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS renimageplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES renimagedlg.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES renimagedlg.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/solid-actions-kcm/CMakeLists.txt b/solid-actions-kcm/CMakeLists.txt index cd6af80b..25773f60 100644 --- a/solid-actions-kcm/CMakeLists.txt +++ b/solid-actions-kcm/CMakeLists.txt @@ -29,9 +29,9 @@ TARGET_LINK_LIBRARIES(solid-action-desktop-gen ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIB ########### install files ############### -INSTALL( TARGETS kcm_solid_actions DESTINATION ${PLUGIN_INSTALL_DIR} ) +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 ${SERVICES_INSTALL_DIR} ) -INSTALL( FILES solid-action-template.desktop DESTINATION ${DATA_INSTALL_DIR}/kcmsolidactions ) -INSTALL( FILES solid-device-type.desktop DESTINATION ${SERVICETYPES_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-actions-kcm/device-actions/CMakeLists.txt b/solid-actions-kcm/device-actions/CMakeLists.txt index a542b120..78ce5b56 100644 --- a/solid-actions-kcm/device-actions/CMakeLists.txt +++ b/solid-actions-kcm/device-actions/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB desktopfile *.desktop) -INSTALL( FILES ${desktopfile} DESTINATION ${DATA_INSTALL_DIR}/solid/devices ) +INSTALL( FILES ${desktopfile} DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/devices ) diff --git a/solid-device-automounter/kcm/CMakeLists.txt b/solid-device-automounter/kcm/CMakeLists.txt index ac799e35..97a387b1 100644 --- a/solid-device-automounter/kcm/CMakeLists.txt +++ b/solid-device-automounter/kcm/CMakeLists.txt @@ -15,6 +15,6 @@ kde4_add_plugin(kcm_device_automounter ${kcm_device_automounter_SRCS} ${device_a target_link_libraries(kcm_device_automounter ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS kcm_device_automounter DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_device_automounter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES device_automounter_kcm.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES device_automounter_kcm.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/solid-device-automounter/kded/CMakeLists.txt b/solid-device-automounter/kded/CMakeLists.txt index fed0d302..854e8981 100644 --- a/solid-device-automounter/kded/CMakeLists.txt +++ b/solid-device-automounter/kded/CMakeLists.txt @@ -7,6 +7,6 @@ kde4_add_plugin(kded_device_automounter ${device_automounter_lib_SRCS} ${kded_de target_link_libraries(kded_device_automounter ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS kded_device_automounter DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_device_automounter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES device_automounter.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(FILES device_automounter.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt index 01b5b73b..c5d2eaf6 100644 --- a/solid-networkstatus/kded/CMakeLists.txt +++ b/solid-networkstatus/kded/CMakeLists.txt @@ -38,7 +38,7 @@ kde4_add_plugin(kded_networkstatus ${kded_networkstatus_PART_SRCS}) target_link_libraries(kded_networkstatus ${KDE4_KDECORE_LIBS}) -install(TARGETS kded_networkstatus DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_networkstatus DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install( FILES networkstatus.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install( FILES networkstatus.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/solidautoeject/CMakeLists.txt b/solidautoeject/CMakeLists.txt index 3d1ca7b3..e2501b1d 100644 --- a/solidautoeject/CMakeLists.txt +++ b/solidautoeject/CMakeLists.txt @@ -8,10 +8,10 @@ kde4_add_plugin(kded_solidautoeject ${kded_solidautoeject_SRCS}) target_link_libraries(kded_solidautoeject ${KDE4_SOLID_LIBS} ${KDE4_KDECORE_LIBS}) -install(TARGETS kded_solidautoeject DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_solidautoeject DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES solidautoeject.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(FILES solidautoeject.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/soliduiserver/CMakeLists.txt b/soliduiserver/CMakeLists.txt index 2572516b..d7a91519 100644 --- a/soliduiserver/CMakeLists.txt +++ b/soliduiserver/CMakeLists.txt @@ -13,10 +13,10 @@ kde4_add_plugin(kded_soliduiserver ${kded_soliduiserver_SRCS}) target_link_libraries(kded_soliduiserver ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kded_soliduiserver DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_soliduiserver DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES soliduiserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(FILES soliduiserver.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/statusnotifierwatcher/CMakeLists.txt b/statusnotifierwatcher/CMakeLists.txt index 308841e8..10a198c7 100644 --- a/statusnotifierwatcher/CMakeLists.txt +++ b/statusnotifierwatcher/CMakeLists.txt @@ -19,8 +19,8 @@ kde4_add_plugin(kded_statusnotifierwatcher ${kded_statusnotifierwatcher_SRCS}) target_link_libraries(kded_statusnotifierwatcher ${KDE4_KIO_LIBS} ) -install(TARGETS kded_statusnotifierwatcher DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_statusnotifierwatcher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install( FILES statusnotifierwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install( FILES statusnotifierwatcher.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/systemsettings/app/CMakeLists.txt b/systemsettings/app/CMakeLists.txt index c22a5ed3..85dd8120 100644 --- a/systemsettings/app/CMakeLists.txt +++ b/systemsettings/app/CMakeLists.txt @@ -17,5 +17,5 @@ add_executable( systemsettings ${systemsettings_SRCS}) 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 ${DATA_INSTALL_DIR}/systemsettings ) -INSTALL( PROGRAMS kdesystemsettings.desktop systemsettings.desktop DESTINATION ${XDG_APPS_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/categories/CMakeLists.txt b/systemsettings/categories/CMakeLists.txt index 6c8b9c5a..81d4382e 100644 --- a/systemsettings/categories/CMakeLists.txt +++ b/systemsettings/categories/CMakeLists.txt @@ -1,5 +1,5 @@ -install( FILES systemsettingscategory.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES systemsettingscategory.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) install( FILES settings-accessibility.desktop @@ -26,10 +26,10 @@ install( FILES settings-window-behaviour.desktop settings-workspace-appearance-and-behavior.desktop settings-workspace-behavior.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES settings-bluetooth.desktop #settings-desktop.desktop settings-sharing.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/systemsettings/core/CMakeLists.txt b/systemsettings/core/CMakeLists.txt index 20e414e8..37832cff 100644 --- a/systemsettings/core/CMakeLists.txt +++ b/systemsettings/core/CMakeLists.txt @@ -26,5 +26,5 @@ target_link_libraries( systemsettingsview ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRAR set_target_properties( systemsettingsview PROPERTIES SOVERSION 2 ) install( TARGETS systemsettingsview ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( FILES ${systemsettingsview_LIB_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/systemsettingsview COMPONENT Devel ) -INSTALL( FILES systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES ${systemsettingsview_LIB_HDRS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/systemsettingsview COMPONENT Devel ) +INSTALL( FILES systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) diff --git a/systemsettings/icons/CMakeLists.txt b/systemsettings/icons/CMakeLists.txt index 0830dd76..d7fe9107 100644 --- a/systemsettings/icons/CMakeLists.txt +++ b/systemsettings/icons/CMakeLists.txt @@ -8,6 +8,6 @@ KDE4_ADD_PLUGIN(icon_mode ${icon_mode_srcs}) TARGET_LINK_LIBRARIES(icon_mode ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS} systemsettingsview ) -INSTALL( TARGETS icon_mode DESTINATION ${PLUGIN_INSTALL_DIR} ) -INSTALL( FILES settings-icon-view.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +INSTALL( TARGETS icon_mode DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +INSTALL( FILES settings-icon-view.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )