From c8cfc66d8bb19de0848bf475651b34d07b093b97 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 18 Feb 2006 09:39:00 +0000 Subject: -renamed the KDE4_something_DIR to something_INSTALL_DIR except KDE4_INCLUDE_DIR, since this is used for compiling and not for installing -change the detection of KDE4_MODULE_DIR to use CMAKE_CURRENT_LIST_FILE I could not commit to kio/kssl/kssl/, so this may break installing there Alex CCMAIL: kde-buildsystem@kde.org CCMAIL: montel@kde.org svn path=/trunk/KDE/kdelibs/; revision=510826 --- am2cmake | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'am2cmake') diff --git a/am2cmake b/am2cmake index d4f3a207..a959779b 100755 --- a/am2cmake +++ b/am2cmake @@ -40,20 +40,20 @@ InstallDirsKDE3 = { } InstallDirsKDE4 = { - "kde_apps" => "${KDE4_APPS_DIR}", - "kde_conf" => "${KDE4_CONFIG_DIR}", - "kde_data" => "${KDE4_DATA_DIR}", - "kde_html" => "${KDE4_HTML_DIR}", + "kde_apps" => "${APPLNK_INSTALL_DIR}", + "kde_conf" => "${CONFIG_INSTALL_DIR}", + "kde_data" => "${DATA_INSTALL_DIR}", + "kde_html" => "${HTML_INSTALL_DIR}", "kde_icon" => "${KDE4_ICON_DIR}", - "kde_kcfg" => "${KDE4_KCFG_DIR}", - "kde_libs_html"=> "${KDE4_LIBS_HTML_DIR}", - "kde_locale" => "${KDE4_LOCALE_DIR}", - "kde_mime" => "${KDE4_MIME_DIR}", - "kde_services" => "${KDE4_SERVICES_DIR}", - "kde_servicetypes" => "${KDE4_SERVICETYPES_DIR}", - "kde_sound" => "${KDE4_SOUND_DIR}", - "kde_templates"=> "${KDE4_TEMPLATES_DIR}", - "kde_wallpaper"=> "${KDE4_WALLPAPER_DIR}", + "kde_kcfg" => "${KCFG_INSTALL_DIR}", + "kde_libs_html"=> "${LIBS_HTML_INSTALL_DIR}", + "kde_locale" => "${LOCALE_INSTALL_DIR}", + "kde_mime" => "${MIME_INSTALL_DIR}", + "kde_services" => "${SERVICES_INSTALL_DIR}", + "kde_servicetypes" => "${SERVICETYPES_INSTALL_DIR}", + "kde_sound" => "${SOUND_INSTALL_DIR}", + "kde_templates"=> "${TEMPLATES_INSTALL_DIR}", + "kde_wallpaper"=> "${WALLPAPER_INSTALL_DIR}", "xdg_apps" => "${XDG_APPS_DIR}", "xdg_directory"=> "${XDG_DIRECTORY_DIR}", "data" => "/share", @@ -867,7 +867,7 @@ class CMakeFile file.printf(" )\n\n") file.printf("set_target_properties(%s PROPERTIES VERSION %d.%d.%d SOVERSION %d )\n", buildTarget.name, buildTarget.versionNumberMajor, buildTarget.versionNumberMinor, buildTarget.versionNumberPatch, buildTarget.versionNumberMajor) - file.printf("install_targets(${KDE4_LIB_INSTALL_DIR} %s )\n\n", buildTarget.name) + file.printf("install_targets(${LIB_INSTALL_DIR} %s )\n\n", buildTarget.name) elsif buildTarget.type==StaticLib file.printf("kde4_add_library(%s STATIC ${%s})\n\n", buildTarget.name, srcsName) @@ -875,16 +875,16 @@ class CMakeFile elsif buildTarget.type==Part if buildTarget.stdPrefix file.printf("kde4_add_plugin(%s WITH_PREFIX ${%s})\n\n", buildTarget.name, srcsName) - file.printf("kde4_install_libtool_file( ${KDE4_PLUGIN_INSTALL_DIR} %s )\n\n", buildTarget.name) + file.printf("kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} %s )\n\n", buildTarget.name) else file.printf("kde4_add_plugin(%s ${%s})\n\n", buildTarget.name, srcsName) - file.printf("kde4_install_libtool_file( ${KDE4_PLUGIN_INSTALL_DIR} %s )\n\n", buildTarget.name) + file.printf("kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} %s )\n\n", buildTarget.name) end file.printf("target_link_libraries(%s ", buildTarget.name) buildTarget.libs.each { |currentLib| file.printf(" %s", currentLib) } file.printf(" )\n\n") - file.printf("install_targets(${KDE4_LIB_INSTALL_DIR}/kde4 %s )\n\n", buildTarget.name) + file.printf("install_targets(${LIB_INSTALL_DIR}/kde4 %s )\n\n", buildTarget.name) elsif buildTarget.type==KDEInit file.printf("kde4_add_klm( %s ${%s})\n\n", buildTarget.name, srcsName) @@ -892,7 +892,7 @@ class CMakeFile buildTarget.libs.each { |currentLib| file.printf(" %s", currentLib) } file.printf(" )\n\n") - file.printf("install_targets(${KDE4_LIB_INSTALL_DIR} kdeinit_%s )\n\n", buildTarget.name) + file.printf("install_targets(${LIB_INSTALL_DIR} kdeinit_%s )\n\n", buildTarget.name) file.printf("target_link_libraries( %s kdeinit_%s )\n", buildTarget.name, buildTarget.name) -- cgit v1.2.1