diff options
| author | David Faure <faure@kde.org> | 2007-03-30 21:24:30 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2007-03-30 21:24:30 +0000 |
| commit | 02b60270c65eaf9ddaea06ce03b04ce379f939ee (patch) | |
| tree | a347d45c0f3e4aeab267d9a3ff1b5361acb83750 | |
| parent | 38bf913772ec87b29b12ce81acd0fa04555c2f03 (diff) | |
| download | extra-cmake-modules-02b60270c65eaf9ddaea06ce03b04ce379f939ee.tar.gz extra-cmake-modules-02b60270c65eaf9ddaea06ce03b04ce379f939ee.tar.bz2 | |
Changed the services and servicetypes directories to "kde4/services" and "kde4/servicetypes"
so that we never try to use a kde3 KPart into a kde4 application, and vice versa,
and to avoid conflicts when installing both into the same prefix.
This solution also leaves room for prepending a kde4/ in front of other resources if needed...
maybe most of them, apart from those that affect $KDEHOME too (like config and data...)
CCMAIL: kde-core-devel@kde.org
svn path=/trunk/KDE/kdelibs/; revision=648276
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index d94efaeb..836abc8a 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -271,8 +271,15 @@ _set_fancy(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The _set_fancy(KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files") _set_fancy(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations") _set_fancy(MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mimelnk" "The install dir for the mimetype desktop files") -_set_fancy(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/services" "The install dir for service (desktop, protocol, ...) files") -_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/servicetypes" "The install dir for servicestypes desktop files") + +# To help with the migration issue, this uses set instead of _set_fancy, temporarily. +# (Otherwise all modules would keep installing into the old dirs) +# This can be reverted starting from May 2007 +set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services") +set(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes") +#_set_fancy(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services" "The install dir for service (desktop, protocol, ...) files") +#_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes" "The install dir for servicestypes desktop files") + _set_fancy(SOUND_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/sounds" "The install dir for sound files") _set_fancy(TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" "The install dir for templates (Create new file...)") _set_fancy(WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" "The install dir for wallpapers") |