From 590106d0c8ee50cec2b570e1c10e49275f081f16 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 17 Feb 2006 18:53:29 +0000 Subject: after discussion with David: -renamed KDE4_ICON_DIR to ICON_INSTALL_DIR -changed KDE4_INSTALL_ICONS(theme dir) to KDE4_INSTALL_ICONS( dir theme) and dir now has to contain the "/icons" subdir, it is NOT appended anymore in the KDE4_INSTALL_ICONS() macro CCMAIL: montel@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=510673 The following changes were in SVN, but were removed from git: M pics/crystalsvg/CMakeLists.txt M pics/hicolor/CMakeLists.txt --- modules/FindKDE4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDE4.cmake') diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 1b8afbe6..71f35d94 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -45,7 +45,6 @@ set(KDE4_APPS_DIR /share/applnk) set(KDE4_CONFIG_DIR /share/config) set(KDE4_DATA_DIR /share/apps) set(KDE4_HTML_DIR /share/doc/HTML) -set(KDE4_ICON_DIR /share/icons) set(KDE4_KCFG_DIR /share/config.kcfg) set(KDE4_LIBS_HTML_DIR /share/doc/HTML) set(KDE4_LOCALE_DIR /share/locale) @@ -62,6 +61,7 @@ set(XDG_DIRECTORY_DIR /share/desktop-directories) # the following are directories where stuff will be installed to #set(KDE4_SYSCONF_INSTALL_DIR "/etc" CACHE STRING "The kde sysconfig install dir (default /etc)") +set(ICON_INSTALL_DIR "/share/icons" CACHE STRING "The icon install dir (default prefix/share/icons/)") set(KDE4_MAN_INSTALL_DIR "/man" CACHE STRING "The kde man install dir (default prefix/man/)") set(KDE4_INFO_INSTALL_DIR "/info" CACHE STRING "The kde info install dir (default prefix/info)") set(KDE4_LIB_INSTALL_DIR "/lib" CACHE STRING "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)") -- cgit v1.2.1