diff --git a/CPackConfig.cmake b/CPackConfig.cmake deleted file mode 100644 index e9bc8167..00000000 --- a/CPackConfig.cmake +++ /dev/null @@ -1,11 +0,0 @@ -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Set of extra desktop applications, part of Katana project") -set(CPACK_PACKAGE_VENDOR "kde-extraapps") -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 25b3a841..00000000 --- a/CTestConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -set(CTEST_PROJECT_NAME "kde-extraapps") diff --git a/about-distro/src/CMakeLists.txt b/about-distro/src/CMakeLists.txt index 731d4c3c..4beb2e5f 100644 --- a/about-distro/src/CMakeLists.txt +++ b/about-distro/src/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(kcm_about_distro ${KDE4_SOLID_LIBRARY} ) -install(TARGETS kcm_about_distro DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES about-distro.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kcm_about_distro DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES about-distro.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/akregator/configuration/CMakeLists.txt b/akregator/configuration/CMakeLists.txt index 20097f45..0d7e06fd 100644 --- a/akregator/configuration/CMakeLists.txt +++ b/akregator/configuration/CMakeLists.txt @@ -18,8 +18,8 @@ target_link_libraries(akregator_config_general ${KDE4_KIO_LIBS} ) -install(FILES akregator_config_general.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_general DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_general.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_general DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -35,8 +35,8 @@ target_link_libraries(akregator_config_appearance ${KDE4_KIO_LIBS} ) -install(FILES akregator_config_appearance.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_appearance DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_appearance.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_appearance DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -52,8 +52,8 @@ target_link_libraries(akregator_config_archive ${KDE4_KIO_LIBS} ) -install(FILES akregator_config_archive.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_archive DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_archive.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_archive DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -69,8 +69,8 @@ target_link_libraries(akregator_config_browser ${KDE4_KIO_LIBS} ) -install(FILES akregator_config_browser.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_browser DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_browser.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_browser DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -87,5 +87,5 @@ target_link_libraries(akregator_config_advanced ${KDE4_KIO_LIBS} ) -install(FILES akregator_config_advanced.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_advanced DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_advanced.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_advanced DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/akregator/interfaces/CMakeLists.txt b/akregator/interfaces/CMakeLists.txt index 6287f8b3..abb84b2a 100644 --- a/akregator/interfaces/CMakeLists.txt +++ b/akregator/interfaces/CMakeLists.txt @@ -22,5 +22,5 @@ set_target_properties(akregatorinterfaces PROPERTIES ) install(TARGETS akregatorinterfaces ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES akregator.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES akregator.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/akregator/plugins/mk4storage/CMakeLists.txt b/akregator/plugins/mk4storage/CMakeLists.txt index d37efa3d..9176a314 100644 --- a/akregator/plugins/mk4storage/CMakeLists.txt +++ b/akregator/plugins/mk4storage/CMakeLists.txt @@ -72,8 +72,8 @@ target_link_libraries(akregator_mk4storage_plugin akregatorinterfaces ) -install(TARGETS akregator_mk4storage_plugin DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS akregator_mk4storage_plugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES akregator_mk4storage_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES akregator_mk4storage_plugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/akregator/plugins/onlinesync/CMakeLists.txt b/akregator/plugins/onlinesync/CMakeLists.txt index 9b1b433d..41f19f12 100644 --- a/akregator/plugins/onlinesync/CMakeLists.txt +++ b/akregator/plugins/onlinesync/CMakeLists.txt @@ -30,8 +30,8 @@ target_link_libraries(akregator_config_onlinesync ${KDE4_KPARTS_LIBS} ) -install(FILES akregator_config_onlinesync.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_onlinesync DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_onlinesync.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_onlinesync DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -62,6 +62,6 @@ target_link_libraries(akregator_onlinesync_plugin ${KDE4_KPARTS_LIBS} ) -install(FILES akregator_onlinesync_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_onlinesync_plugin DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES akregator_onlinesync_plugin.rc DESTINATION ${DATA_INSTALL_DIR}/akregator_onlinesync_plugin) +install(FILES akregator_onlinesync_plugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_onlinesync_plugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES akregator_onlinesync_plugin.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/akregator_onlinesync_plugin) diff --git a/akregator/plugins/sharemicroblog/CMakeLists.txt b/akregator/plugins/sharemicroblog/CMakeLists.txt index 34257035..779fc577 100644 --- a/akregator/plugins/sharemicroblog/CMakeLists.txt +++ b/akregator/plugins/sharemicroblog/CMakeLists.txt @@ -20,9 +20,9 @@ target_link_libraries(akregator_sharemicroblog_plugin ${KDE4_KPARTS_LIBS} ) -install(FILES akregator_sharemicroblog_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_sharemicroblog_plugin DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES akregator_sharemicroblog_plugin.rc DESTINATION ${DATA_INSTALL_DIR}/akregator_sharemicroblog_plugin) +install(FILES akregator_sharemicroblog_plugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_sharemicroblog_plugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES akregator_sharemicroblog_plugin.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/akregator_sharemicroblog_plugin) ########### settings target ############### @@ -41,5 +41,5 @@ target_link_libraries(akregator_config_sharemicroblog ${KDE4_KPARTS_LIBS} ) -install(FILES akregator_config_sharemicroblog.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS akregator_config_sharemicroblog DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES akregator_config_sharemicroblog.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(TARGETS akregator_config_sharemicroblog DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index b2bbc56a..701cde10 100644 --- a/akregator/src/CMakeLists.txt +++ b/akregator/src/CMakeLists.txt @@ -119,14 +119,14 @@ target_link_libraries(akregatorpart syndication ) -install(TARGETS akregatorpart DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS akregatorpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(PROGRAMS akregator.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES akregator_part.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES articleviewer.rc pageviewer.rc akregator_part.rc akregator.notifyrc DESTINATION ${DATA_INSTALL_DIR}/akregator) -install(FILES akregator_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) -install(FILES akregator_shell.rc DESTINATION ${DATA_INSTALL_DIR}/akregator) -install(FILES feed.protocol DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES org.kde.akregator.part.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) +install(PROGRAMS akregator.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES akregator_part.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES articleviewer.rc pageviewer.rc akregator_part.rc akregator.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/akregator) +install(FILES akregator_plugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) +install(FILES akregator_shell.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/akregator) +install(FILES feed.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES org.kde.akregator.part.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) diff --git a/akregator/src/about/CMakeLists.txt b/akregator/src/about/CMakeLists.txt index b43f6441..7b94bf8e 100644 --- a/akregator/src/about/CMakeLists.txt +++ b/akregator/src/about/CMakeLists.txt @@ -1 +1 @@ -install(FILES top-left-akregator.png main.html akregator.css DESTINATION ${DATA_INSTALL_DIR}/akregator/about) +install(FILES top-left-akregator.png main.html akregator.css DESTINATION ${KDE4_DATA_INSTALL_DIR}/akregator/about) diff --git a/akregator/src/icons/CMakeLists.txt b/akregator/src/icons/CMakeLists.txt index f05b19d5..ec81543d 100644 --- a/akregator/src/icons/CMakeLists.txt +++ b/akregator/src/icons/CMakeLists.txt @@ -1,3 +1,3 @@ -install(FILES kmmsgnew.png kmmsgunseen.png DESTINATION ${DATA_INSTALL_DIR}/akregator/pics) +install(FILES kmmsgnew.png kmmsgunseen.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/akregator/pics) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index 96d5888c..ef04d96c 100644 --- a/ark/CMakeLists.txt +++ b/ark/CMakeLists.txt @@ -12,11 +12,6 @@ include(MacroLibrary) macro_optional_find_package(LibArchive 3.0.3) macro_log_feature(LibArchive_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake -) - add_definitions(-DQT_NO_CAST_FROM_ASCII) include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}) diff --git a/ark/CTestConfig.cmake b/ark/CTestConfig.cmake deleted file mode 100644 index 8bd9c156..00000000 --- a/ark/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "ark") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=ark") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/ark/CTestCustom.cmake.in b/ark/CTestCustom.cmake.in deleted file mode 100644 index 130d3df8..00000000 --- a/ark/CTestCustom.cmake.in +++ /dev/null @@ -1 +0,0 @@ -set(CTEST_CUSTOM_COVERAGE_EXCLUDE ".moc$" "moc_" "ui_") diff --git a/ark/app/CMakeLists.txt b/ark/app/CMakeLists.txt index 19c5999b..a5559ea1 100644 --- a/ark/app/CMakeLists.txt +++ b/ark/app/CMakeLists.txt @@ -26,10 +26,10 @@ configure_file( ) install( TARGETS ark ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES ark_addtoservicemenu.desktop ${CMAKE_CURRENT_BINARY_DIR}/ark_servicemenu.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) -install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/ark.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install(FILES ark_addtoservicemenu.desktop ${CMAKE_CURRENT_BINARY_DIR}/ark_servicemenu.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus) +install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/ark.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/ark.appdata.xml DESTINATION share/appdata ) -install( FILES arkui.rc DESTINATION ${DATA_INSTALL_DIR}/ark ) +install( FILES arkui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ark ) ########### konqueror ark_extract_here plugin ############### macro_optional_find_package( LibKonq ) @@ -41,7 +41,7 @@ if (LIBKONQ_FOUND) kde4_add_plugin(extracthere WITH_PREFIX ${extracthere_SRCS}) target_link_libraries(extracthere kerfuffle ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} ${LIBKONQ_LIBRARY} ) include_directories(${LIBKONQ_INCLUDE_DIR}) - install( TARGETS extracthere DESTINATION ${PLUGIN_INSTALL_DIR} ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/ark_dndextract.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + install( TARGETS extracthere DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/ark_dndextract.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif (LIBKONQ_FOUND) diff --git a/ark/app/icons/CMakeLists.txt b/ark/app/icons/CMakeLists.txt index 02e3c9ec..64266d49 100644 --- a/ark/app/icons/CMakeLists.txt +++ b/ark/app/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/ark/kerfuffle/CMakeLists.txt b/ark/kerfuffle/CMakeLists.txt index c1cd90ed..11cab447 100644 --- a/ark/kerfuffle/CMakeLists.txt +++ b/ark/kerfuffle/CMakeLists.txt @@ -29,11 +29,11 @@ install(TARGETS kerfuffle ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES kerfufflePlugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) install( FILES ark.kcfg - DESTINATION ${KCFG_INSTALL_DIR} + DESTINATION ${KDE4_KCFG_INSTALL_DIR} ) if (ENABLE_TESTING) diff --git a/ark/part/CMakeLists.txt b/ark/part/CMakeLists.txt index 9fbfc0cb..e3df0a1d 100644 --- a/ark/part/CMakeLists.txt +++ b/ark/part/CMakeLists.txt @@ -18,10 +18,10 @@ configure_file( ${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop ) -install(TARGETS arkpart DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS arkpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES ark_part.rc DESTINATION ${DATA_INSTALL_DIR}/ark ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES ark_part.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ark ) diff --git a/ark/plugins/clilhaplugin/CMakeLists.txt b/ark/plugins/clilhaplugin/CMakeLists.txt index 548ff593..ddb59a68 100644 --- a/ark/plugins/clilhaplugin/CMakeLists.txt +++ b/ark/plugins/clilhaplugin/CMakeLists.txt @@ -15,7 +15,7 @@ configure_file( ########### install files ############### -install(TARGETS kerfuffle_clilha DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_clilha.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kerfuffle_clilha DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_clilha.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_CLILHA_MIMETYPES}" PARENT_SCOPE) diff --git a/ark/plugins/cliplugin-example/CMakeLists.txt b/ark/plugins/cliplugin-example/CMakeLists.txt index ad9619be..9fb074d4 100644 --- a/ark/plugins/cliplugin-example/CMakeLists.txt +++ b/ark/plugins/cliplugin-example/CMakeLists.txt @@ -2,6 +2,6 @@ set(kerfuffle_cli_SRCS cliplugin.cpp) kde4_add_plugin(kerfuffle_cli ${kerfuffle_cli_SRCS}) target_link_libraries(kerfuffle_cli ${KDE4_KDECORE_LIBS} kerfuffle) -install(TARGETS kerfuffle_cli DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kerfuffle_cli.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kerfuffle_cli DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kerfuffle_cli.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/ark/plugins/clirarplugin/CMakeLists.txt b/ark/plugins/clirarplugin/CMakeLists.txt index 44102f28..617ab1f6 100644 --- a/ark/plugins/clirarplugin/CMakeLists.txt +++ b/ark/plugins/clirarplugin/CMakeLists.txt @@ -15,8 +15,8 @@ configure_file( ########### install files ############### -install(TARGETS kerfuffle_clirar DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_clirar.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kerfuffle_clirar DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_clirar.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/ark/plugins/karchiveplugin/CMakeLists.txt b/ark/plugins/karchiveplugin/CMakeLists.txt index b72fc45e..738bb55d 100644 --- a/ark/plugins/karchiveplugin/CMakeLists.txt +++ b/ark/plugins/karchiveplugin/CMakeLists.txt @@ -15,7 +15,7 @@ configure_file( ########### install files ############### -install(TARGETS kerfuffle_karchive DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES kerfuffle_karchive.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS kerfuffle_karchive DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES kerfuffle_karchive.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_KARCHIVE_MIMETYPES}" PARENT_SCOPE) diff --git a/ark/plugins/libarchive/CMakeLists.txt b/ark/plugins/libarchive/CMakeLists.txt index 74cd5967..58b293fa 100644 --- a/ark/plugins/libarchive/CMakeLists.txt +++ b/ark/plugins/libarchive/CMakeLists.txt @@ -29,18 +29,18 @@ kde4_add_plugin(kerfuffle_libarchive ${kerfuffle_libarchive_SRCS}) target_link_libraries(kerfuffle_libarchive ${KDE4_KDECORE_LIBS} ${LibArchive_LIBRARIES} kerfuffle) -install(TARGETS kerfuffle_libarchive DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kerfuffle_libarchive DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_libarchive.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_libarchive_readonly.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}" PARENT_SCOPE) diff --git a/ark/plugins/libsinglefileplugin/CMakeLists.txt b/ark/plugins/libsinglefileplugin/CMakeLists.txt index bdaecfd3..42c7db65 100644 --- a/ark/plugins/libsinglefileplugin/CMakeLists.txt +++ b/ark/plugins/libsinglefileplugin/CMakeLists.txt @@ -21,9 +21,9 @@ if (ZLIB_FOUND) target_link_libraries(kerfuffle_libgz ${KDE4_KDECORE_LIBS} kerfuffle ) - install(TARGETS kerfuffle_libgz DESTINATION ${PLUGIN_INSTALL_DIR} ) + install(TARGETS kerfuffle_libgz DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) - install( FILES kerfuffle_libgz.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + install( FILES kerfuffle_libgz.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif (ZLIB_FOUND) # @@ -41,9 +41,9 @@ if (BZIP2_FOUND) target_link_libraries(kerfuffle_libbz2 ${KDE4_KDECORE_LIBS} kerfuffle ) - install(TARGETS kerfuffle_libbz2 DESTINATION ${PLUGIN_INSTALL_DIR} ) + install(TARGETS kerfuffle_libbz2 DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) - install( FILES kerfuffle_libbz2.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + install( FILES kerfuffle_libbz2.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif (BZIP2_FOUND) # @@ -61,9 +61,9 @@ if (LIBLZMA_FOUND) target_link_libraries(kerfuffle_libxz ${KDE4_KDECORE_LIBS} kerfuffle ) - install(TARGETS kerfuffle_libxz DESTINATION ${PLUGIN_INSTALL_DIR} ) + install(TARGETS kerfuffle_libxz DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) - install( FILES kerfuffle_libxz.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + install( FILES kerfuffle_libxz.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) endif (LIBLZMA_FOUND) set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_LIBSINGLEFILE_MIMETYPES}" PARENT_SCOPE) diff --git a/bluedevil/libbluedevil/CMakeLists.txt b/bluedevil/libbluedevil/CMakeLists.txt index 3ca19216..ea3d4466 100644 --- a/bluedevil/libbluedevil/CMakeLists.txt +++ b/bluedevil/libbluedevil/CMakeLists.txt @@ -1,7 +1,9 @@ project(libbluedevil) +find_package(KDE4 REQUIRED) +include(KDE4Defaults) + include(CheckCXXCompilerFlag) -include(GNUInstallDirs) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) @@ -15,15 +17,9 @@ if (_HAVE_VISIBILITY AND NOT WIN32) endif (_HAVE_VISIBILITY_INLINES) endif (_HAVE_VISIBILITY AND NOT WIN32) -# -### lib64/32 support kde like -# -set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) -set(LIB_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}) - -set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}" - LIBRARY DESTINATION "${LIB_INSTALL_DIR}" - ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel ) +set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${KDE4_BIN_INSTALL_DIR}" + LIBRARY DESTINATION "${KDE4_LIB_INSTALL_DIR}" + ARCHIVE DESTINATION "${KDE4_LIB_INSTALL_DIR}" COMPONENT Devel ) set(GENERIC_LIB_VERSION "2.1") diff --git a/bluedevil/libbluedevil/bluedevil/CMakeLists.txt b/bluedevil/libbluedevil/bluedevil/CMakeLists.txt index 3f3d8426..9d6999cc 100644 --- a/bluedevil/libbluedevil/bluedevil/CMakeLists.txt +++ b/bluedevil/libbluedevil/bluedevil/CMakeLists.txt @@ -42,5 +42,5 @@ install(FILES bluedevilmanager.h if(NOT WIN32) # pkgconfig file configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bluedevil.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bluedevil.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluedevil.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluedevil.pc DESTINATION ${KDE4_LIB_INSTALL_DIR}/pkgconfig) endif(NOT WIN32) diff --git a/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in b/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in index e6742bd0..d6a595d5 100644 --- a/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in +++ b/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in @@ -1,5 +1,5 @@ prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ +libdir=@KDE4_LIB_INSTALL_DIR@ includedir=@CMAKE_INSTALL_PREFIX@/include Name: bluedevil diff --git a/bluedevil/src/CMakeLists.txt b/bluedevil/src/CMakeLists.txt index 3ab19895..fc3d1620 100644 --- a/bluedevil/src/CMakeLists.txt +++ b/bluedevil/src/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory(monolithic) add_subdirectory(fileitemactionplugin) install(FILES bluedevil.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/bluedevil) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/bluedevil) -install(FILES bluedevil-mime.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) -update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) +install(FILES bluedevil-mime.xml DESTINATION ${KDE4_XDG_MIME_INSTALL_DIR}) +update_xdg_mimetypes(${KDE4_XDG_MIME_INSTALL_DIR}) diff --git a/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt b/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt index 503d421d..04dc6776 100644 --- a/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(bluedevil-authorize ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) install(TARGETS bluedevil-authorize - DESTINATION ${LIBEXEC_INSTALL_DIR}) + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt b/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt index 79efd0a6..c09b963a 100644 --- a/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(bluedevil-confirmmodechange ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS}) install(TARGETS bluedevil-confirmmodechange - DESTINATION ${LIBEXEC_INSTALL_DIR}) + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt b/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt index 98275c88..b77ba3bd 100644 --- a/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(bluedevil-requestconfirmation ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS}) install(TARGETS bluedevil-requestconfirmation - DESTINATION ${LIBEXEC_INSTALL_DIR}) + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt b/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt index a4354301..7d622c85 100644 --- a/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt @@ -10,4 +10,4 @@ target_link_libraries(bluedevil-requestpin ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS}) install(TARGETS bluedevil-requestpin - DESTINATION ${LIBEXEC_INSTALL_DIR}) + DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/bluedevil/src/daemon/kded/CMakeLists.txt b/bluedevil/src/daemon/kded/CMakeLists.txt index 452c495d..83e5dc88 100644 --- a/bluedevil/src/daemon/kded/CMakeLists.txt +++ b/bluedevil/src/daemon/kded/CMakeLists.txt @@ -35,5 +35,5 @@ target_link_libraries(kded_bluedevil bluedevil ) -install(TARGETS kded_bluedevil DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES bluedevil.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) \ No newline at end of file +install(TARGETS kded_bluedevil DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES bluedevil.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) \ No newline at end of file diff --git a/bluedevil/src/fileitemactionplugin/CMakeLists.txt b/bluedevil/src/fileitemactionplugin/CMakeLists.txt index 84b155e3..c7677016 100644 --- a/bluedevil/src/fileitemactionplugin/CMakeLists.txt +++ b/bluedevil/src/fileitemactionplugin/CMakeLists.txt @@ -7,5 +7,5 @@ qt4_add_dbus_interface(fileitemactionplugin_SRCS ${kded_bluedevil.xml} kded_blue kde4_add_plugin(bluetoothfiletiemaction ${fileitemactionplugin_SRCS}) target_link_libraries(bluetoothfiletiemaction ${KDE4_KIO_LIBS}) -install(TARGETS bluetoothfiletiemaction DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES bluedevilsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS bluetoothfiletiemaction DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES bluedevilsendfile.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/bluedevil/src/kcmodule/CMakeLists.txt b/bluedevil/src/kcmodule/CMakeLists.txt index caa697d2..e06d12af 100644 --- a/bluedevil/src/kcmodule/CMakeLists.txt +++ b/bluedevil/src/kcmodule/CMakeLists.txt @@ -29,8 +29,8 @@ target_link_libraries(kcm_bluedeviltransfer ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} install(TARGETS kcm_bluedevildevices kcm_bluedeviladapters - kcm_bluedeviltransfer DESTINATION ${PLUGIN_INSTALL_DIR}) + kcm_bluedeviltransfer DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES bluedevildevices.desktop bluedeviladapters.desktop - bluedeviltransfer.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + bluedeviltransfer.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/bluedevil/src/kio/bluetooth/CMakeLists.txt b/bluedevil/src/kio/bluetooth/CMakeLists.txt index d407c0bc..eabc00da 100644 --- a/bluedevil/src/kio/bluetooth/CMakeLists.txt +++ b/bluedevil/src/kio/bluetooth/CMakeLists.txt @@ -14,5 +14,5 @@ target_link_libraries(kio_bluetooth ) ########### install files ############### -install(TARGETS kio_bluetooth DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES bluetooth.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kio_bluetooth DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES bluetooth.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/bluedevil/src/kio/obexftp/CMakeLists.txt b/bluedevil/src/kio/obexftp/CMakeLists.txt index 66265ff3..e1476186 100644 --- a/bluedevil/src/kio/obexftp/CMakeLists.txt +++ b/bluedevil/src/kio/obexftp/CMakeLists.txt @@ -26,8 +26,8 @@ target_link_libraries(kio_obexftp ${QT_QTDBUS_LIBRARY} ) -install(TARGETS kio_obexftp DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kio_obexftp DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES obexftp.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES obexftp.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt b/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt index 699e1d40..fc2d1f56 100644 --- a/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt +++ b/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt @@ -20,6 +20,6 @@ target_link_libraries(kded_obexftpdaemon ${KDE4_KFILE_LIBS} ) -install(TARGETS kded_obexftpdaemon DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES obexftpdaemon.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(TARGETS kded_obexftpdaemon DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES obexftpdaemon.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) diff --git a/bluedevil/src/monolithic/CMakeLists.txt b/bluedevil/src/monolithic/CMakeLists.txt index c4fe3778..fb4087a6 100644 --- a/bluedevil/src/monolithic/CMakeLists.txt +++ b/bluedevil/src/monolithic/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(bluedevil-monolithic ${monolithic_SRCS}) target_link_libraries(bluedevil-monolithic ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) install(TARGETS bluedevil-monolithic ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES bluedevil-monolithic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES bluedevil-monolithic.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) diff --git a/bluedevil/src/sendfile/CMakeLists.txt b/bluedevil/src/sendfile/CMakeLists.txt index 0c8d0b14..cc915d88 100644 --- a/bluedevil/src/sendfile/CMakeLists.txt +++ b/bluedevil/src/sendfile/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(bluedevil-sendfile ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} bluedevil) install(TARGETS bluedevil-sendfile DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES bluedevil-sendfile.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES bluedevil-sendfile.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) diff --git a/bluedevil/src/wizard/CMakeLists.txt b/bluedevil/src/wizard/CMakeLists.txt index 5c4e5f30..9d77d153 100644 --- a/bluedevil/src/wizard/CMakeLists.txt +++ b/bluedevil/src/wizard/CMakeLists.txt @@ -27,5 +27,5 @@ target_link_libraries(bluedevil-wizard ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) install(TARGETS bluedevil-wizard ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES bluedevil-wizard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES pin-code-database.xml DESTINATION ${DATA_INSTALL_DIR}/bluedevilwizard) +install(FILES bluedevil-wizard.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES pin-code-database.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/bluedevilwizard) diff --git a/ffmpegthumbs/CMakeLists.txt b/ffmpegthumbs/CMakeLists.txt index 0e7dd652..d91b6801 100644 --- a/ffmpegthumbs/CMakeLists.txt +++ b/ffmpegthumbs/CMakeLists.txt @@ -36,11 +36,11 @@ target_link_libraries(ffmpegthumbs ${SWSCALE_LIBRARIES} ) -install(TARGETS ffmpegthumbs DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS ffmpegthumbs DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES ffmpegthumbs.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ffmpegthumbs.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/filelight/CTestConfig.cmake b/filelight/CTestConfig.cmake deleted file mode 100644 index da0fad1a..00000000 --- a/filelight/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "filelight") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=filelight") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/filelight/misc/CMakeLists.txt b/filelight/misc/CMakeLists.txt index 0f4a49f5..438cc5fa 100644 --- a/filelight/misc/CMakeLists.txt +++ b/filelight/misc/CMakeLists.txt @@ -18,10 +18,10 @@ # along with this program. If not, see . ####################################################################### -install(FILES filelightpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(PROGRAMS filelight.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES filelightrc DESTINATION ${CONFIG_INSTALL_DIR}) -install(FILES filelightpartui.rc DESTINATION ${DATA_INSTALL_DIR}/filelightpart) -install(FILES filelightui.rc DESTINATION ${DATA_INSTALL_DIR}/filelight) +install(FILES filelightpart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(PROGRAMS filelight.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES filelightrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) +install(FILES filelightpartui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/filelightpart) +install(FILES filelightui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/filelight) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/filelight/src/part/CMakeLists.txt b/filelight/src/part/CMakeLists.txt index 54494edf..577d2502 100644 --- a/filelight/src/part/CMakeLists.txt +++ b/filelight/src/part/CMakeLists.txt @@ -44,4 +44,4 @@ target_link_libraries(filelightpart radialmap ${KDE4_SOLID_LIBS} ) -install(TARGETS filelightpart DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS filelightpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/gwenview/app/CMakeLists.txt b/gwenview/app/CMakeLists.txt index 10065781..abfd1bbc 100644 --- a/gwenview/app/CMakeLists.txt +++ b/gwenview/app/CMakeLists.txt @@ -68,8 +68,8 @@ endif() install(TARGETS gwenview ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES gwenviewui.rc DESTINATION ${DATA_INSTALL_DIR}/gwenview) +install(FILES gwenviewui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/gwenview) -install(PROGRAMS gwenview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(PROGRAMS gwenview.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -install(FILES slideshow.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) +install(FILES slideshow.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus) diff --git a/gwenview/color-schemes/CMakeLists.txt b/gwenview/color-schemes/CMakeLists.txt index c7e3bf8e..cfa3fd54 100644 --- a/gwenview/color-schemes/CMakeLists.txt +++ b/gwenview/color-schemes/CMakeLists.txt @@ -1,4 +1,4 @@ install( FILES fullscreen.colors - DESTINATION ${DATA_INSTALL_DIR}/gwenview/color-schemes/ + DESTINATION ${KDE4_DATA_INSTALL_DIR}/gwenview/color-schemes/ ) diff --git a/gwenview/cursors/CMakeLists.txt b/gwenview/cursors/CMakeLists.txt index 85722f4b..66d7bff4 100644 --- a/gwenview/cursors/CMakeLists.txt +++ b/gwenview/cursors/CMakeLists.txt @@ -1,4 +1,4 @@ install( FILES zoom.png - DESTINATION ${DATA_INSTALL_DIR}/gwenview/cursors/ + DESTINATION ${KDE4_DATA_INSTALL_DIR}/gwenview/cursors/ ) diff --git a/gwenview/icons/CMakeLists.txt b/gwenview/icons/CMakeLists.txt index 106884f4..248f55f5 100644 --- a/gwenview/icons/CMakeLists.txt +++ b/gwenview/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/gwenview/images/CMakeLists.txt b/gwenview/images/CMakeLists.txt index eb2bb069..27b654c1 100644 --- a/gwenview/images/CMakeLists.txt +++ b/gwenview/images/CMakeLists.txt @@ -1,3 +1,3 @@ install(FILES background.png - DESTINATION ${DATA_INSTALL_DIR}/gwenview/images/ + DESTINATION ${KDE4_DATA_INSTALL_DIR}/gwenview/images/ ) diff --git a/gwenview/importer/CMakeLists.txt b/gwenview/importer/CMakeLists.txt index a78f792a..6bcea661 100644 --- a/gwenview/importer/CMakeLists.txt +++ b/gwenview/importer/CMakeLists.txt @@ -46,4 +46,4 @@ install(TARGETS gwenview_importer ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES gwenview_importer.desktop gwenview_importer_camera.desktop - DESTINATION ${DATA_INSTALL_DIR}/solid/actions/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions/) diff --git a/gwenview/part/CMakeLists.txt b/gwenview/part/CMakeLists.txt index dc9dfe55..bb13aea6 100644 --- a/gwenview/part/CMakeLists.txt +++ b/gwenview/part/CMakeLists.txt @@ -12,7 +12,7 @@ kde4_add_plugin(gvpart ${gvpart_SRCS}) target_link_libraries(gvpart ${KDE4_KPARTS_LIBS} gwenviewlib) -install(TARGETS gvpart DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES gvpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS gvpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES gvpart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES gvpart.rc - DESTINATION ${DATA_INSTALL_DIR}/gvpart) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/gvpart) diff --git a/jovie/filters/CMakeLists.txt b/jovie/filters/CMakeLists.txt index c2101936..874c7c94 100644 --- a/jovie/filters/CMakeLists.txt +++ b/jovie/filters/CMakeLists.txt @@ -18,5 +18,5 @@ endif() install( FILES jovie_filterplugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) diff --git a/jovie/filters/stringreplacer/CMakeLists.txt b/jovie/filters/stringreplacer/CMakeLists.txt index a8c086a2..4d1d4803 100644 --- a/jovie/filters/stringreplacer/CMakeLists.txt +++ b/jovie/filters/stringreplacer/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(jovie_stringreplacerplugin ${KDE4_KIO_LIBS} ${QT_QTXML_LIB install( TARGETS jovie_stringreplacerplugin - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### test cdata escaper ########## @@ -42,12 +42,12 @@ install( kmail.xml festival_unspeakable_chars.xml qt2plaintext.xml - DESTINATION ${DATA_INSTALL_DIR}/jovie/stringreplacer + DESTINATION ${KDE4_DATA_INSTALL_DIR}/jovie/stringreplacer ) install( FILES jovie_stringreplacerplugin.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/jovie/filters/talkerchooser/CMakeLists.txt b/jovie/filters/talkerchooser/CMakeLists.txt index fbbe4fdc..31834c6c 100644 --- a/jovie/filters/talkerchooser/CMakeLists.txt +++ b/jovie/filters/talkerchooser/CMakeLists.txt @@ -13,17 +13,17 @@ target_link_libraries(jovie_talkerchooserplugin ${KDE4_KIO_LIBS} kttsd) install( TARGETS jovie_talkerchooserplugin - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES female_notifications_rc - DESTINATION ${DATA_INSTALL_DIR}/jovie/talkerchooser + DESTINATION ${KDE4_DATA_INSTALL_DIR}/jovie/talkerchooser ) install( FILES jovie_talkerchooserplugin.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/jovie/filters/xmltransformer/CMakeLists.txt b/jovie/filters/xmltransformer/CMakeLists.txt index 04d3a5e8..61e125e0 100644 --- a/jovie/filters/xmltransformer/CMakeLists.txt +++ b/jovie/filters/xmltransformer/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(jovie_xmltransformerplugin ${KDE4_KIO_LIBS} kttsd) install( TARGETS jovie_xmltransformerplugin - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### @@ -21,10 +21,10 @@ install( FILES xhtml2ssml.xsl xhtml2ssml_simple.xsl - DESTINATION ${DATA_INSTALL_DIR}/jovie/xmltransformer + DESTINATION ${KDE4_DATA_INSTALL_DIR}/jovie/xmltransformer ) install( FILES jovie_xmltransformerplugin.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/jovie/icons/CMakeLists.txt b/jovie/icons/CMakeLists.txt index 02e3c9ec..64266d49 100644 --- a/jovie/icons/CMakeLists.txt +++ b/jovie/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/jovie/jovie/CMakeLists.txt b/jovie/jovie/CMakeLists.txt index cb6b187b..e3123c45 100644 --- a/jovie/jovie/CMakeLists.txt +++ b/jovie/jovie/CMakeLists.txt @@ -39,18 +39,18 @@ install(TARGETS jovie_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES SSMLtoPlainText.xsl - DESTINATION ${DATA_INSTALL_DIR}/jovie/xslt + DESTINATION ${KDE4_DATA_INSTALL_DIR}/jovie/xslt ) install( FILES jovie.desktop kttsd.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( PROGRAMS jovieapp.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/jovie/kcmkttsmgr/CMakeLists.txt b/jovie/kcmkttsmgr/CMakeLists.txt index 028a7992..84f2e5c7 100644 --- a/jovie/kcmkttsmgr/CMakeLists.txt +++ b/jovie/kcmkttsmgr/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(kcm_kttsd ${KDE4_KIO_LIBS} ${SPEECHD_LIBRARIES} kttsd) install( TARGETS kcm_kttsd - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) @@ -27,12 +27,12 @@ install( install( FILES kcmkttsd.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES kcmkttsd_testmessage.desktop - DESTINATION ${DATA_INSTALL_DIR}/jovie + DESTINATION ${KDE4_DATA_INSTALL_DIR}/jovie ) diff --git a/jovie/libkttsd/CMakeLists.txt b/jovie/libkttsd/CMakeLists.txt index 99ccad6b..2f8a7c95 100644 --- a/jovie/libkttsd/CMakeLists.txt +++ b/jovie/libkttsd/CMakeLists.txt @@ -29,5 +29,5 @@ install(TARGETS kttsd ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -#install(FILES kttsd_synthplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +#install(FILES kttsd_synthplugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) diff --git a/kcalc/CMakeLists.txt b/kcalc/CMakeLists.txt index 0f9ee41e..8505670b 100644 --- a/kcalc/CMakeLists.txt +++ b/kcalc/CMakeLists.txt @@ -59,9 +59,9 @@ install(TARGETS kcalc ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS kcalc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install( FILES kcalc.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install( FILES kcalcui.rc DESTINATION ${DATA_INSTALL_DIR}/kcalc) -install( FILES scienceconstants.xml DESTINATION ${DATA_INSTALL_DIR}/kcalc) +install( PROGRAMS kcalc.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install( FILES kcalc.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) +install( FILES kcalcui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcalc) +install( FILES scienceconstants.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcalc) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kcalc/CTestConfig.cmake b/kcalc/CTestConfig.cmake deleted file mode 100644 index 22e5a449..00000000 --- a/kcalc/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "kcalc") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=kcalc") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/kcolorchooser/CMakeLists.txt b/kcolorchooser/CMakeLists.txt index 0bf05218..a224c954 100644 --- a/kcolorchooser/CMakeLists.txt +++ b/kcolorchooser/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(kcolorchooser ${kcolorchooser_SRCS}) target_link_libraries(kcolorchooser ${KDE4_KDEUI_LIBS}) install(TARGETS kcolorchooser ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( PROGRAMS kcolorchooser.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( PROGRAMS kcolorchooser.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kcron/src/CMakeLists.txt b/kcron/src/CMakeLists.txt index 30ceac39..2917b872 100644 --- a/kcron/src/CMakeLists.txt +++ b/kcron/src/CMakeLists.txt @@ -57,6 +57,6 @@ target_link_libraries(kcm_cron ${KDE4_KIO_LIBS} ) -install(TARGETS kcm_cron DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_cron DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES kcm_cron.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(FILES kcm_cron.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt b/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt index e7686262..1c500693 100644 --- a/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt +++ b/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt @@ -11,8 +11,8 @@ kde4_add_plugin(sambausershareplugin ${sambausershareplugin_PART_SRCS}) target_link_libraries(sambausershareplugin ${KDE4_KIO_LIBS}) -install(TARGETS sambausershareplugin DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS sambausershareplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES sambausershareplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES sambausershareplugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/CTestConfig.cmake b/kdeplasma-addons/CTestConfig.cmake deleted file mode 100644 index 045e0c38..00000000 --- a/kdeplasma-addons/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "kdeplasma-addons") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=kdeplasma-addons") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/kdeplasma-addons/applets/bball/CMakeLists.txt b/kdeplasma-addons/applets/bball/CMakeLists.txt index c3653ee4..fc1dafcf 100644 --- a/kdeplasma-addons/applets/bball/CMakeLists.txt +++ b/kdeplasma-addons/applets/bball/CMakeLists.txt @@ -13,17 +13,17 @@ target_link_libraries(plasma_applet_bball install( TARGETS plasma_applet_bball - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-applet-bball.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES bball.svgz football.svgz bounce.ogg - DESTINATION ${DATA_INSTALL_DIR}/bball/ + DESTINATION ${KDE4_DATA_INSTALL_DIR}/bball/ ) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/binary-clock/CMakeLists.txt b/kdeplasma-addons/applets/binary-clock/CMakeLists.txt index fe3e09e5..4839a4d4 100644 --- a/kdeplasma-addons/applets/binary-clock/CMakeLists.txt +++ b/kdeplasma-addons/applets/binary-clock/CMakeLists.txt @@ -6,6 +6,6 @@ kde4_add_plugin(plasma_applet_binaryclock ${binaryclock_SRCS}) target_link_libraries(plasma_applet_binaryclock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) -install(TARGETS plasma_applet_binaryclock DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_binaryclock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-binaryclock.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-applet-binaryclock.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/blackboard/CMakeLists.txt b/kdeplasma-addons/applets/blackboard/CMakeLists.txt index 8888d976..97e10413 100644 --- a/kdeplasma-addons/applets/blackboard/CMakeLists.txt +++ b/kdeplasma-addons/applets/blackboard/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(plasma_applet_blackboard ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) install(TARGETS plasma_applet_blackboard - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-blackboard.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/bookmarks/CMakeLists.txt b/kdeplasma-addons/applets/bookmarks/CMakeLists.txt index bdc3300c..f2b247cb 100644 --- a/kdeplasma-addons/applets/bookmarks/CMakeLists.txt +++ b/kdeplasma-addons/applets/bookmarks/CMakeLists.txt @@ -14,5 +14,5 @@ target_link_libraries( plasma_applet_bookmarks ${KDE4_KIO_LIBS} ) -install( TARGETS plasma_applet_bookmarks DESTINATION ${PLUGIN_INSTALL_DIR}) -install( FILES plasma-applet-bookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_applet_bookmarks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install( FILES plasma-applet-bookmarks.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeplasma-addons/applets/bubblemon/CMakeLists.txt b/kdeplasma-addons/applets/bubblemon/CMakeLists.txt index ad550eb4..1bc88b64 100644 --- a/kdeplasma-addons/applets/bubblemon/CMakeLists.txt +++ b/kdeplasma-addons/applets/bubblemon/CMakeLists.txt @@ -3,4 +3,4 @@ project(plasma-applet-bubblemon) add_subdirectory(src) add_subdirectory(images) -install(FILES plasma-applet-bubblemon.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-applet-bubblemon.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/bubblemon/images/CMakeLists.txt b/kdeplasma-addons/applets/bubblemon/images/CMakeLists.txt index 762d6bf7..7537ac16 100644 --- a/kdeplasma-addons/applets/bubblemon/images/CMakeLists.txt +++ b/kdeplasma-addons/applets/bubblemon/images/CMakeLists.txt @@ -1 +1 @@ -install(FILES bubble.svg DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/bubblemon) +install(FILES bubble.svg DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/bubblemon) diff --git a/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt b/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt index ea026821..076f7d69 100644 --- a/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt +++ b/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt @@ -6,4 +6,4 @@ set(bubblemon_SRCS kde4_add_plugin(plasma_applet_bubblemon ${bubblemon_SRCS}) target_link_libraries(plasma_applet_bubblemon ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_applet_bubblemon DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_bubblemon DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/calculator/CMakeLists.txt b/kdeplasma-addons/applets/calculator/CMakeLists.txt index 48297077..c214e895 100644 --- a/kdeplasma-addons/applets/calculator/CMakeLists.txt +++ b/kdeplasma-addons/applets/calculator/CMakeLists.txt @@ -1,8 +1,8 @@ project(plasma-calculator) install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/calculator) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/calculator) install(FILES package/metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-calculator.desktop) diff --git a/kdeplasma-addons/applets/community/CMakeLists.txt b/kdeplasma-addons/applets/community/CMakeLists.txt index bfc28b50..1ac67c86 100644 --- a/kdeplasma-addons/applets/community/CMakeLists.txt +++ b/kdeplasma-addons/applets/community/CMakeLists.txt @@ -36,8 +36,8 @@ target_link_libraries( ${QT_QTWEBKIT_LIBRARY} ) -install(TARGETS plasma_applet_opendesktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-opendesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_opendesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-opendesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES user.css DESTINATION ${DATA_INSTALL_DIR}/plasma-applet-opendesktop/) +install(FILES user.css DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma-applet-opendesktop/) diff --git a/kdeplasma-addons/applets/dict/CMakeLists.txt b/kdeplasma-addons/applets/dict/CMakeLists.txt index 8a1d373c..07d1f462 100644 --- a/kdeplasma-addons/applets/dict/CMakeLists.txt +++ b/kdeplasma-addons/applets/dict/CMakeLists.txt @@ -12,11 +12,11 @@ target_link_libraries(plasma_applet_dict install( TARGETS plasma_applet_dict - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-dict-default.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/eyes/CMakeLists.txt b/kdeplasma-addons/applets/eyes/CMakeLists.txt index f4c90570..b27d4c30 100644 --- a/kdeplasma-addons/applets/eyes/CMakeLists.txt +++ b/kdeplasma-addons/applets/eyes/CMakeLists.txt @@ -8,12 +8,12 @@ target_link_libraries(plasma_applet_eyes ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_eyes - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-eyes.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES eyes.svg - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt b/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt index 5e427275..bb1787eb 100644 --- a/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt +++ b/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt @@ -9,6 +9,6 @@ kde4_add_plugin(plasma_applet_fifteenPuzzle ${fifteenPuzzle_SRCS}) target_link_libraries(plasma_applet_fifteenPuzzle ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_fifteenPuzzle DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-fifteenPuzzle.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES images/blanksquare.svg DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/fifteenPuzzle/) +install(TARGETS plasma_applet_fifteenPuzzle DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-fifteenPuzzle.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES images/blanksquare.svg DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/fifteenPuzzle/) diff --git a/kdeplasma-addons/applets/fifteenPuzzle/icons/CMakeLists.txt b/kdeplasma-addons/applets/fifteenPuzzle/icons/CMakeLists.txt index 106884f4..248f55f5 100644 --- a/kdeplasma-addons/applets/fifteenPuzzle/icons/CMakeLists.txt +++ b/kdeplasma-addons/applets/fifteenPuzzle/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt b/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt index b84e1c60..78cf5079 100644 --- a/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt +++ b/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt @@ -12,5 +12,5 @@ kde4_add_plugin(plasma_applet_fileWatcher ${fileWatcher_SRCS}) target_link_libraries(plasma_applet_fileWatcher ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_fileWatcher DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-fileWatcher-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_fileWatcher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-fileWatcher-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/frame/CMakeLists.txt b/kdeplasma-addons/applets/frame/CMakeLists.txt index dd19234a..97c6b371 100644 --- a/kdeplasma-addons/applets/frame/CMakeLists.txt +++ b/kdeplasma-addons/applets/frame/CMakeLists.txt @@ -23,8 +23,8 @@ target_link_libraries(plasma_applet_frame ${KDE4_KEXIV2_LIBS} ) -install(TARGETS plasma_applet_frame DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-frame-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -#install(FILES picture-frame-default.jpg DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) +install(TARGETS plasma_applet_frame DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-frame-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +#install(FILES picture-frame-default.jpg DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) -install(FILES picture-frame-default.jpg DESTINATION ${DATA_INSTALL_DIR}/plasma-applet-frame/) +install(FILES picture-frame-default.jpg DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma-applet-frame/) diff --git a/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt b/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt index 9cb99d0b..b734cc60 100644 --- a/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt +++ b/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt @@ -5,6 +5,6 @@ set(fuzzyclock_SRCS fuzzyClock.cpp fuzzyClockConfig.ui ) kde4_add_plugin(plasma_applet_fuzzy_clock ${fuzzyclock_SRCS}) target_link_libraries(plasma_applet_fuzzy_clock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) -install(TARGETS plasma_applet_fuzzy_clock DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_fuzzy_clock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES plasma-clock-fuzzy.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-clock-fuzzy.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/icontasks/CMakeLists.txt b/kdeplasma-addons/applets/icontasks/CMakeLists.txt index cc4a5daf..ba7d431f 100644 --- a/kdeplasma-addons/applets/icontasks/CMakeLists.txt +++ b/kdeplasma-addons/applets/icontasks/CMakeLists.txt @@ -77,7 +77,7 @@ endif(Q_WS_X11) include_directories(${CMAKE_BINARY_DIR} ${DBUSMENUQT_INCLUDE_DIR}) -install(TARGETS plasma_applet_icontasks DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-icontasks.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES badge.svgz launcherseparator.svgz progress.svgz indicators.svgz dropindicators.svgz DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/icontasks/) -install(FILES mediabuttonsrc DESTINATION ${DATA_INSTALL_DIR}/${CMAKE_PROJECT_NAME}) +install(TARGETS plasma_applet_icontasks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-icontasks.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES badge.svgz launcherseparator.svgz progress.svgz indicators.svgz dropindicators.svgz DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/icontasks/) +install(FILES mediabuttonsrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/${CMAKE_PROJECT_NAME}) diff --git a/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt b/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt index 13518e39..0493b3c7 100644 --- a/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt +++ b/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(plasma_applet_incomingmsg ${QT_QTNETWORK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_incomingmsg - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-incomingmsg.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt b/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt index 0e96ebba..786f6669 100644 --- a/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt +++ b/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt @@ -26,7 +26,7 @@ if(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND) add_executable(kimpanel-ibus-panel ${kimpanel_ibus_panel_SRCS}) target_link_libraries(kimpanel-ibus-panel ${IBUS_LIBRARIES} ${GLIB2_LIBRARIES} ${GIO_LIBRARIES} ${GOBJECT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY}) endif() - install(TARGETS kimpanel-ibus-panel DESTINATION ${LIBEXEC_INSTALL_DIR}) + install(TARGETS kimpanel-ibus-panel DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kimpanel.xml.in ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ibus/component) endif(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND) diff --git a/kdeplasma-addons/applets/kimpanel/backend/ibus/kimpanel.xml.in b/kdeplasma-addons/applets/kimpanel/backend/ibus/kimpanel.xml.in index cd4d9dd0..f912f1d7 100644 --- a/kdeplasma-addons/applets/kimpanel/backend/ibus/kimpanel.xml.in +++ b/kdeplasma-addons/applets/kimpanel/backend/ibus/kimpanel.xml.in @@ -3,7 +3,7 @@ org.freedesktop.IBus.Panel KDE IM Panel Component - @LIBEXEC_INSTALL_DIR@/kimpanel-ibus-panel + @KDE4_LIBEXEC_INSTALL_DIR@/kimpanel-ibus-panel 1.5.8 Weng Xuetian <wengxt@gmail.com> GPL diff --git a/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt b/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt index da680584..26ba1307 100644 --- a/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt +++ b/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt @@ -6,5 +6,5 @@ if(SCIM_FOUND) set(kimpanel_scim_panel_SRCS main.cpp) add_executable(kimpanel-scim-panel ${kimpanel_scim_panel_SRCS}) target_link_libraries(kimpanel-scim-panel ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${SCIM_LIBRARIES}) - install(TARGETS kimpanel-scim-panel DESTINATION ${LIBEXEC_INSTALL_DIR}) + install(TARGETS kimpanel-scim-panel DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) endif(SCIM_FOUND) diff --git a/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt b/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt index c0fe4bdb..d73a969c 100644 --- a/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt +++ b/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt @@ -25,10 +25,10 @@ target_link_libraries(plasma_applet_kimpanel ) install(TARGETS plasma_applet_kimpanel - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-kimpanel.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES kimpanelconfig.kcfg - DESTINATION ${KCFG_INSTALL_DIR}) + DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/knowledgebase/CMakeLists.txt b/kdeplasma-addons/applets/knowledgebase/CMakeLists.txt index 9d796c31..cec2fd4b 100644 --- a/kdeplasma-addons/applets/knowledgebase/CMakeLists.txt +++ b/kdeplasma-addons/applets/knowledgebase/CMakeLists.txt @@ -13,7 +13,7 @@ target_link_libraries(plasma_applet_knowledgebase ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) install(TARGETS plasma_applet_knowledgebase - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-knowledgebase.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt b/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt index e67ca9c1..0cf00b08 100644 --- a/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt +++ b/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt @@ -21,5 +21,5 @@ if(KOLOURPICKER_X11_LIB) target_link_libraries(plasma_applet_kolourpicker ${X11_X11_LIB}) endif(KOLOURPICKER_X11_LIB) -install(TARGETS plasma_applet_kolourpicker DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-kolourpicker-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_kolourpicker DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-kolourpicker-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/konsoleprofiles/CMakeLists.txt b/kdeplasma-addons/applets/konsoleprofiles/CMakeLists.txt index 59a4fac2..5c8dd929 100644 --- a/kdeplasma-addons/applets/konsoleprofiles/CMakeLists.txt +++ b/kdeplasma-addons/applets/konsoleprofiles/CMakeLists.txt @@ -1,6 +1,6 @@ project(konsoleprofiles) install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/konsoleprofiles) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/konsoleprofiles) -install(FILES package/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-konsoleprofiles.desktop) +install(FILES package/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-konsoleprofiles.desktop) diff --git a/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt index 7785a310..6c2a7e8b 100644 --- a/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt @@ -92,7 +92,7 @@ set_target_properties(lancelot-menu PROPERTIES OUTPUT_NAME lancelot) install(TARGETS lancelot-menu ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES lancelot.notifyrc DESTINATION ${DATA_INSTALL_DIR}/lancelot) +install(FILES lancelot.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/lancelot) -install(FILES lancelot.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES lancelot.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/lancelot/cmake/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/cmake/CMakeLists.txt index b9b7eef1..48ce5363 100644 --- a/kdeplasma-addons/applets/lancelot/cmake/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/cmake/CMakeLists.txt @@ -1,6 +1,6 @@ ## install the cmake files -# set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules ) +# set(module_install_dir ${KDE4_DATA_INSTALL_DIR}/cmake/modules ) # # set(cmakeFiles # FindLancelot.cmake diff --git a/kdeplasma-addons/applets/lancelot/icons/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/icons/CMakeLists.txt index 106884f4..248f55f5 100644 --- a/kdeplasma-addons/applets/lancelot/icons/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt index 280a63b3..6d7cd67d 100644 --- a/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt @@ -40,11 +40,11 @@ target_link_libraries( install( TARGETS plasma_applet_lancelot_launcher - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-applet-lancelot-launcher.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt index 550020d2..73c4539a 100644 --- a/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt @@ -33,18 +33,18 @@ target_link_libraries( install( TARGETS plasma_applet_lancelot_part - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-applet-lancelot-part.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES lancelotpart-mime.xml - DESTINATION ${XDG_MIME_INSTALL_DIR} + DESTINATION ${KDE4_XDG_MIME_INSTALL_DIR} ) -update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) +update_xdg_mimetypes(${KDE4_XDG_MIME_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/lancelot/themes/Androbit/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/Androbit/CMakeLists.txt index d24e2444..2967bbba 100644 --- a/kdeplasma-addons/applets/lancelot/themes/Androbit/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/Androbit/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Androbit/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Androbit/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Androbit/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Androbit/lancelot/ ) diff --git a/kdeplasma-addons/applets/lancelot/themes/Aya/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/Aya/CMakeLists.txt index 16adbb4d..c5cb5343 100644 --- a/kdeplasma-addons/applets/lancelot/themes/Aya/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/Aya/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Aya/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Aya/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Aya/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Aya/lancelot/ ) diff --git a/kdeplasma-addons/applets/lancelot/themes/Produkt/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/Produkt/CMakeLists.txt index 47c4dfab..7ba0f2c6 100644 --- a/kdeplasma-addons/applets/lancelot/themes/Produkt/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/Produkt/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Produkt/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Produkt/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Produkt/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Produkt/lancelot/ ) diff --git a/kdeplasma-addons/applets/lancelot/themes/Tibanna/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/Tibanna/CMakeLists.txt index fd2e4a78..bc477c74 100644 --- a/kdeplasma-addons/applets/lancelot/themes/Tibanna/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/Tibanna/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Tibanna/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Tibanna/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/Tibanna/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/Tibanna/lancelot/ ) diff --git a/kdeplasma-addons/applets/lancelot/themes/air/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/air/CMakeLists.txt index 2f53ea7c..eb46f227 100644 --- a/kdeplasma-addons/applets/lancelot/themes/air/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/air/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/lancelot/ ) diff --git a/kdeplasma-addons/applets/lancelot/themes/oxygen/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/oxygen/CMakeLists.txt index e0e1a1c9..b7874266 100644 --- a/kdeplasma-addons/applets/lancelot/themes/oxygen/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/oxygen/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/oxygen/lancelot/ ) diff --git a/kdeplasma-addons/applets/lancelot/themes/slim-glow/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/themes/slim-glow/CMakeLists.txt index 1cdace54..073a4591 100644 --- a/kdeplasma-addons/applets/lancelot/themes/slim-glow/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/themes/slim-glow/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB lancelot_svgs *.svgz) -install( FILES ${lancelot_svgs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/slim-glow/lancelot/ ) +install( FILES ${lancelot_svgs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/slim-glow/lancelot/ ) FILE(GLOB lancelot_configs *.config) -install( FILES ${lancelot_configs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/slim-glow/lancelot/ ) +install( FILES ${lancelot_configs} DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/slim-glow/lancelot/ ) diff --git a/kdeplasma-addons/applets/leavenote/CMakeLists.txt b/kdeplasma-addons/applets/leavenote/CMakeLists.txt index 939ccb85..174390f4 100644 --- a/kdeplasma-addons/applets/leavenote/CMakeLists.txt +++ b/kdeplasma-addons/applets/leavenote/CMakeLists.txt @@ -9,10 +9,10 @@ target_link_libraries(plasma_applet_leavenote ${QT_QTNETWORK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_leavenote - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-leavenote.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) # TODO add cmake switch or sth. to only install if the target # does not exist or reenable with a different svg than notes @@ -20,4 +20,4 @@ install(FILES plasma-applet-leavenote.desktop # notes.svgz (leavenote.svgz) otherwise anyway. #install( # FILES notes.svgz -# DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) +# DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) diff --git a/kdeplasma-addons/applets/life/CMakeLists.txt b/kdeplasma-addons/applets/life/CMakeLists.txt index 1924938e..9a94e1e9 100644 --- a/kdeplasma-addons/applets/life/CMakeLists.txt +++ b/kdeplasma-addons/applets/life/CMakeLists.txt @@ -6,9 +6,9 @@ target_link_libraries(plasma_applet_life ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_life - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-life.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/luna/CMakeLists.txt b/kdeplasma-addons/applets/luna/CMakeLists.txt index fac4f4ad..26ce6137 100644 --- a/kdeplasma-addons/applets/luna/CMakeLists.txt +++ b/kdeplasma-addons/applets/luna/CMakeLists.txt @@ -6,12 +6,12 @@ target_link_libraries(plasma_applet_luna ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_luna - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-luna.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES luna.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/magnifique/CMakeLists.txt b/kdeplasma-addons/applets/magnifique/CMakeLists.txt index 9c3220ed..f885b70a 100644 --- a/kdeplasma-addons/applets/magnifique/CMakeLists.txt +++ b/kdeplasma-addons/applets/magnifique/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(plasma_applet_magnifique ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_magnifique - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-magnifique.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/notes/CMakeLists.txt b/kdeplasma-addons/applets/notes/CMakeLists.txt index f530a9c5..2ad81f33 100644 --- a/kdeplasma-addons/applets/notes/CMakeLists.txt +++ b/kdeplasma-addons/applets/notes/CMakeLists.txt @@ -15,14 +15,14 @@ target_link_libraries(plasma_applet_notes ) install( TARGETS plasma_applet_notes - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-notes-default.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) install( FILES notes.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) diff --git a/kdeplasma-addons/applets/nowplaying/CMakeLists.txt b/kdeplasma-addons/applets/nowplaying/CMakeLists.txt index 4a1ff129..60e062b7 100644 --- a/kdeplasma-addons/applets/nowplaying/CMakeLists.txt +++ b/kdeplasma-addons/applets/nowplaying/CMakeLists.txt @@ -1,9 +1,9 @@ project(nowplaying) install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/nowplaying) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/nowplaying) install(FILES package/metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-nowplaying.desktop) diff --git a/kdeplasma-addons/applets/paste/CMakeLists.txt b/kdeplasma-addons/applets/paste/CMakeLists.txt index 81fd5d9c..18d4a199 100644 --- a/kdeplasma-addons/applets/paste/CMakeLists.txt +++ b/kdeplasma-addons/applets/paste/CMakeLists.txt @@ -20,5 +20,5 @@ kde4_add_plugin(plasma_applet_paste ${paste_SRCS}) target_link_libraries(plasma_applet_paste ${X11_X11_LIB} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_applet_paste DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-paste.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_paste DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-paste.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/pastebin/CMakeLists.txt b/kdeplasma-addons/applets/pastebin/CMakeLists.txt index 28ffee9e..bb721aee 100644 --- a/kdeplasma-addons/applets/pastebin/CMakeLists.txt +++ b/kdeplasma-addons/applets/pastebin/CMakeLists.txt @@ -8,8 +8,8 @@ set(pastebin_SRCS kde4_add_plugin(plasma_applet_pastebin ${pastebin_SRCS}) target_link_libraries(plasma_applet_pastebin ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_applet_pastebin DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-pastebin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES plasma_pastebin.notifyrc DESTINATION ${DATA_INSTALL_DIR}/plasma_pastebin) -install(FILES pastebin.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(TARGETS plasma_applet_pastebin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-pastebin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES plasma_pastebin.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma_pastebin) +install(FILES pastebin.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt b/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt index 10432034..29ca00f9 100644 --- a/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt +++ b/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt @@ -36,12 +36,12 @@ kde4_add_plugin(plasma_applet_plasmaboard ${plasmaboard_SRCS}) target_link_libraries(plasma_applet_plasmaboard ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${X11_XTest_LIB} ${X11_X11_LIB} ${X11_LIBS}) -install(TARGETS plasma_applet_plasmaboard DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_plasmaboard DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma_applet_plasmaboard.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) add_subdirectory(layouts) #install(FILES plasmaboard_key.svg -# DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) +# DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) diff --git a/kdeplasma-addons/applets/plasmaboard/layouts/CMakeLists.txt b/kdeplasma-addons/applets/plasmaboard/layouts/CMakeLists.txt index e7338e02..a602709c 100644 --- a/kdeplasma-addons/applets/plasmaboard/layouts/CMakeLists.txt +++ b/kdeplasma-addons/applets/plasmaboard/layouts/CMakeLists.txt @@ -1,3 +1,3 @@ -install( FILES basic.xml extended.xml full.xml tablet.xml mid.xml DESTINATION ${DATA_INSTALL_DIR}/plasmaboard ) +install( FILES basic.xml extended.xml full.xml tablet.xml mid.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasmaboard ) diff --git a/kdeplasma-addons/applets/previewer/CMakeLists.txt b/kdeplasma-addons/applets/previewer/CMakeLists.txt index 76749051..55ac96d6 100644 --- a/kdeplasma-addons/applets/previewer/CMakeLists.txt +++ b/kdeplasma-addons/applets/previewer/CMakeLists.txt @@ -20,17 +20,17 @@ target_link_libraries(plasma_applet_previewer install(TARGETS plasma_applet_previewer - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-previewer.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES preview.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) +install(FILES preview.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus) install(FILES previewer-16.svgz previewer-22.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/qalculate/CMakeLists.txt b/kdeplasma-addons/applets/qalculate/CMakeLists.txt index 9b0882a3..25a09890 100644 --- a/kdeplasma-addons/applets/qalculate/CMakeLists.txt +++ b/kdeplasma-addons/applets/qalculate/CMakeLists.txt @@ -19,9 +19,9 @@ target_link_libraries(plasma_applet_qalculate ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES}) install(TARGETS plasma_applet_qalculate - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-qalculate.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) add_subdirectory(icons) diff --git a/kdeplasma-addons/applets/qalculate/icons/CMakeLists.txt b/kdeplasma-addons/applets/qalculate/icons/CMakeLists.txt index aa329996..7d35cf51 100644 --- a/kdeplasma-addons/applets/qalculate/icons/CMakeLists.txt +++ b/kdeplasma-addons/applets/qalculate/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kdeplasma-addons/applets/rssnow/CMakeLists.txt b/kdeplasma-addons/applets/rssnow/CMakeLists.txt index 2622fd34..3b0a8a46 100644 --- a/kdeplasma-addons/applets/rssnow/CMakeLists.txt +++ b/kdeplasma-addons/applets/rssnow/CMakeLists.txt @@ -11,11 +11,11 @@ set(news_SRCS kde4_add_plugin(plasma_applet_rssnow ${news_SRCS}) target_link_libraries(plasma_applet_rssnow ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS}) -install(TARGETS plasma_applet_rssnow DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-rssnow.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES feeds DESTINATION ${DATA_INSTALL_DIR}/rssnow) +install(TARGETS plasma_applet_rssnow DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-rssnow.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES feeds DESTINATION ${KDE4_DATA_INSTALL_DIR}/rssnow) install(FILES arrows.svgz rssnow.svgz background.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/rssnow/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/rssnow/) diff --git a/kdeplasma-addons/applets/showdashboard/CMakeLists.txt b/kdeplasma-addons/applets/showdashboard/CMakeLists.txt index a86c54bc..c4e75a69 100644 --- a/kdeplasma-addons/applets/showdashboard/CMakeLists.txt +++ b/kdeplasma-addons/applets/showdashboard/CMakeLists.txt @@ -14,8 +14,8 @@ target_link_libraries(plasma_applet_showdashboard ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_showdashboard - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-showdashboard.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/showdesktop/CMakeLists.txt b/kdeplasma-addons/applets/showdesktop/CMakeLists.txt index eb532075..99bebcdc 100644 --- a/kdeplasma-addons/applets/showdesktop/CMakeLists.txt +++ b/kdeplasma-addons/applets/showdesktop/CMakeLists.txt @@ -9,6 +9,6 @@ kde4_add_plugin(plasma_applet_showdesktop ${showdesktop_SRCS}) target_link_libraries(plasma_applet_showdesktop ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ) -install(TARGETS plasma_applet_showdesktop DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_showdesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-showdesktop.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/social-news/CMakeLists.txt b/kdeplasma-addons/applets/social-news/CMakeLists.txt index 7d15258a..6a7753d0 100644 --- a/kdeplasma-addons/applets/social-news/CMakeLists.txt +++ b/kdeplasma-addons/applets/social-news/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries( ${KDE4_PLASMA_LIBS} ) -install(TARGETS plasma_applet_opendesktop_activities DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-opendesktop-activities.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_opendesktop_activities DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-opendesktop-activities.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES plasma-applet-opendesktop-activities.notifyrc DESTINATION ${DATA_INSTALL_DIR}/plasma-applet-opendesktop-activities/) +install(FILES plasma-applet-opendesktop-activities.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma-applet-opendesktop-activities/) diff --git a/kdeplasma-addons/applets/spellcheck/CMakeLists.txt b/kdeplasma-addons/applets/spellcheck/CMakeLists.txt index 4e5776c6..c648171b 100644 --- a/kdeplasma-addons/applets/spellcheck/CMakeLists.txt +++ b/kdeplasma-addons/applets/spellcheck/CMakeLists.txt @@ -3,5 +3,5 @@ set(spellcheck_SRCS SpellCheck.cpp) kde4_add_plugin(plasma_applet_spellcheck ${spellcheck_SRCS}) target_link_libraries(plasma_applet_spellcheck ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS}) -install(TARGETS plasma_applet_spellcheck DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-spellcheck.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_spellcheck DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-spellcheck.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt b/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt index c8286199..bedf3f59 100644 --- a/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt +++ b/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt @@ -11,7 +11,7 @@ target_link_libraries(plasma-applet_systemloadviewer ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma-applet_systemloadviewer - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-systemloadviewer.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/timer/CMakeLists.txt b/kdeplasma-addons/applets/timer/CMakeLists.txt index ced81b90..ea8a0d70 100644 --- a/kdeplasma-addons/applets/timer/CMakeLists.txt +++ b/kdeplasma-addons/applets/timer/CMakeLists.txt @@ -17,10 +17,10 @@ target_link_libraries(plasma_applet_timer ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_timer - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-timer.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES timer.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/) diff --git a/kdeplasma-addons/applets/unitconverter/CMakeLists.txt b/kdeplasma-addons/applets/unitconverter/CMakeLists.txt index 365701c1..a6311255 100644 --- a/kdeplasma-addons/applets/unitconverter/CMakeLists.txt +++ b/kdeplasma-addons/applets/unitconverter/CMakeLists.txt @@ -17,8 +17,8 @@ target_link_libraries(plasma_applet_unitconverter ${KDE4_KUNITCONVERSION_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) install(TARGETS plasma_applet_unitconverter - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-unitconverter.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/weather/CMakeLists.txt b/kdeplasma-addons/applets/weather/CMakeLists.txt index b5d01dce..af6dd2da 100644 --- a/kdeplasma-addons/applets/weather/CMakeLists.txt +++ b/kdeplasma-addons/applets/weather/CMakeLists.txt @@ -13,7 +13,7 @@ target_link_libraries(plasma_applet_weather ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KUNITCONVERSION_LIBS}) -install(TARGETS plasma_applet_weather DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES wind-arrows.svgz DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/weather/) -install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/packages/org.kde.weather) +install(TARGETS plasma_applet_weather DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-weather.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES wind-arrows.svgz DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/weather/) +install(DIRECTORY package/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/packages/org.kde.weather) diff --git a/kdeplasma-addons/applets/weatherstation/CMakeLists.txt b/kdeplasma-addons/applets/weatherstation/CMakeLists.txt index 7b8a25dc..a018fb76 100644 --- a/kdeplasma-addons/applets/weatherstation/CMakeLists.txt +++ b/kdeplasma-addons/applets/weatherstation/CMakeLists.txt @@ -16,9 +16,9 @@ target_link_libraries(plasma_applet_weatherstation ${KDE4WORKSPACE_WEATHERION_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) -install(TARGETS plasma_applet_weatherstation DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_applet_weatherstation DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-weatherstation.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES lcd2.svgz @@ -26,6 +26,6 @@ install(FILES lcd_digits.svgz wind_arrows.svgz weather_icons.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/weatherstation/) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/weatherstation/) -install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/packages/org.kde.lcdweather) +install(DIRECTORY package/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/packages/org.kde.lcdweather) diff --git a/kdeplasma-addons/cmake/CMakeLists.txt b/kdeplasma-addons/cmake/CMakeLists.txt index 94e8fb34..5bccf567 100644 --- a/kdeplasma-addons/cmake/CMakeLists.txt +++ b/kdeplasma-addons/cmake/CMakeLists.txt @@ -1,6 +1,6 @@ ## install the cmake files -set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules ) +set(module_install_dir ${KDE4_DATA_INSTALL_DIR}/cmake/modules ) set(cmakeFiles FindLancelot.cmake diff --git a/kdeplasma-addons/cmake/FindLancelot-Datamodels.cmake b/kdeplasma-addons/cmake/FindLancelot-Datamodels.cmake index cdf7543d..1ebd85db 100644 --- a/kdeplasma-addons/cmake/FindLancelot-Datamodels.cmake +++ b/kdeplasma-addons/cmake/FindLancelot-Datamodels.cmake @@ -38,13 +38,13 @@ if (NOT Lancelot_Datamodels_FIND_QUIETLY) find_path(LANCELOT_DATAMODELS_INCLUDE_DIR NAMES lancelot-datamodels/BaseModel.h PATHS ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_INSTALL_DIR} ) find_library(LANCELOT_DATAMODELS_LIBS NAMES lancelot-datamodels PATHS ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} + ${KDE4_LIB_INSTALL_DIR} ) include(FindPackageHandleStandardArgs) diff --git a/kdeplasma-addons/cmake/FindLancelot.cmake b/kdeplasma-addons/cmake/FindLancelot.cmake index ceb90e50..c4838a13 100644 --- a/kdeplasma-addons/cmake/FindLancelot.cmake +++ b/kdeplasma-addons/cmake/FindLancelot.cmake @@ -38,13 +38,13 @@ if (NOT Lancelot_FIND_QUIETLY) find_path(LANCELOT_INCLUDE_DIR NAMES lancelot/lancelot.h PATHS ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_INSTALL_DIR} ) find_library(LANCELOT_LIBS NAMES lancelot PATHS ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} + ${KDE4_LIB_INSTALL_DIR} ) include(FindPackageHandleStandardArgs) diff --git a/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt index 94ccfd9d..43b76f4a 100644 --- a/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt +++ b/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt @@ -4,5 +4,5 @@ set(groupingdesktop_SRCS groupingdesktop.cpp) kde4_add_plugin(plasma_containment_groupingdesktop ${groupingdesktop_SRCS}) target_link_libraries(plasma_containment_groupingdesktop ${KDE4_PLASMA_LIBS} plasma_groupingcontainment) -install(TARGETS plasma_containment_groupingdesktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-groupingdesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) \ No newline at end of file +install(TARGETS plasma_containment_groupingdesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-containment-groupingdesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) \ No newline at end of file diff --git a/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt index ced7752a..0377a3e0 100644 --- a/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt +++ b/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt @@ -4,5 +4,5 @@ set(griddesktop_SRCS griddesktop.cpp) kde4_add_plugin(plasma_containment_griddesktop ${griddesktop_SRCS}) target_link_libraries(plasma_containment_griddesktop ${KDE4_PLASMA_LIBS} plasma_groupingcontainment) -install(TARGETS plasma_containment_griddesktop DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-griddesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) \ No newline at end of file +install(TARGETS plasma_containment_griddesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-containment-griddesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) \ No newline at end of file diff --git a/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt index 71d5e197..fdd46d7a 100644 --- a/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt +++ b/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt @@ -4,5 +4,5 @@ set(groupingpanel_SRCS groupingpanel.cpp) kde4_add_plugin(plasma_containment_groupingpanel ${groupingpanel_SRCS}) target_link_libraries(plasma_containment_groupingpanel ${KDE4_PLASMA_LIBS} plasma_groupingcontainment) -install(TARGETS plasma_containment_groupingpanel DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-containment-groupingpanel.desktop DESTINATION ${SERVICES_INSTALL_DIR}) \ No newline at end of file +install(TARGETS plasma_containment_groupingpanel DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-containment-groupingpanel.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) \ No newline at end of file diff --git a/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt b/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt index 29422c01..487a7c47 100644 --- a/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(plasma_engine_kdecommits ${KDE4_PLASMA_LIBS}) install(TARGETS plasma_engine_kdecommits - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-engine-kdecommits.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES src/kdecommits.operations - DESTINATION ${DATA_INSTALL_DIR}/plasma/services) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt b/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt index b96b4f10..e3af05e9 100644 --- a/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt @@ -21,10 +21,10 @@ target_link_libraries(plasma_engine_kdeobservatory ${KDE4_PLASMA_LIBS}) install(TARGETS plasma_engine_kdeobservatory - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-engine-kdeobservatory.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES src/kdeobservatory.operations - DESTINATION ${DATA_INSTALL_DIR}/plasma/services) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/kdeplasma-addons/dataengines/kimpanel/CMakeLists.txt b/kdeplasma-addons/dataengines/kimpanel/CMakeLists.txt index 0fe502e8..c7cd7b59 100644 --- a/kdeplasma-addons/dataengines/kimpanel/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/kimpanel/CMakeLists.txt @@ -19,9 +19,9 @@ target_link_libraries(plasma_engine_kimpanel ${KDE4_PLASMA_LIBS}) install(TARGETS plasma_engine_kimpanel - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) install(FILES plasma-dataengine-kimpanel.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES kimpanel.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(FILES kimpanel.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt b/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt index 2e2dd213..1de7e0a1 100644 --- a/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt @@ -6,7 +6,7 @@ set(konsoleprofilesengine_SRCS kde4_add_plugin(plasma_engine_konsoleprofiles ${konsoleprofilesengine_SRCS}) target_link_libraries(plasma_engine_konsoleprofiles ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_engine_konsoleprofiles DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-konsoleprofiles.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES org.kde.plasma.dataengine.konsoleprofiles.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_konsoleprofiles DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-konsoleprofiles.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES org.kde.plasma.dataengine.konsoleprofiles.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/kdeplasma-addons/dataengines/ocs/CMakeLists.txt b/kdeplasma-addons/dataengines/ocs/CMakeLists.txt index f6faf3f0..2d899f09 100644 --- a/kdeplasma-addons/dataengines/ocs/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/ocs/CMakeLists.txt @@ -14,6 +14,6 @@ kde4_add_plugin(plasma_engine_ocs ${ocs_engine_SRCS}) target_link_libraries(plasma_engine_ocs ${LIBATTICA_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTNETWORK_LIBRARY} ) -install(TARGETS plasma_engine_ocs DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-ocs.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES ocsPerson.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_ocs DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-ocs.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES ocsPerson.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/kdeplasma-addons/dataengines/potd/CMakeLists.txt b/kdeplasma-addons/dataengines/potd/CMakeLists.txt index 677c1a0c..d2e432fe 100644 --- a/kdeplasma-addons/dataengines/potd/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/potd/CMakeLists.txt @@ -6,8 +6,8 @@ set(potd_engine_SRCS kde4_add_plugin(plasma_engine_potd ${potd_engine_SRCS} ) target_link_libraries(plasma_engine_potd plasmapotdprovidercore ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ) -install(TARGETS plasma_engine_potd DESTINATION ${PLUGIN_INSTALL_DIR} ) -install(FILES plasma-dataengine-potd.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS plasma_engine_potd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install(FILES plasma-dataengine-potd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) ########### plugin core library ############ @@ -21,7 +21,7 @@ target_link_libraries( plasmapotdprovidercore ${KDE4_KDEUI_LIBS} ) set_target_properties( plasmapotdprovidercore PROPERTIES VERSION 1.0.0 SOVERSION 1 ) install( TARGETS plasmapotdprovidercore ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( FILES plasma_potdprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES plasma_potdprovider.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) ########### plugins ############### @@ -32,8 +32,8 @@ set( potd_flickr_provider_SRCS kde4_add_plugin( plasma_potd_flickrprovider ${potd_flickr_provider_SRCS} ) target_link_libraries( plasma_potd_flickrprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -install( TARGETS plasma_potd_flickrprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES flickrprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_potd_flickrprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES flickrprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set( potd_apod_provider_SRCS @@ -42,8 +42,8 @@ set( potd_apod_provider_SRCS kde4_add_plugin( plasma_potd_apodprovider ${potd_apod_provider_SRCS} ) target_link_libraries( plasma_potd_apodprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS}) -install( TARGETS plasma_potd_apodprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES apodprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_potd_apodprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES apodprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set( potd_epod_provider_SRCS epodprovider.cpp @@ -51,8 +51,8 @@ set( potd_epod_provider_SRCS kde4_add_plugin( plasma_potd_epodprovider ${potd_epod_provider_SRCS} ) target_link_libraries( plasma_potd_epodprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -install( TARGETS plasma_potd_epodprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES epodprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_potd_epodprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES epodprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set( potd_osei_provider_SRCS @@ -61,8 +61,8 @@ set( potd_osei_provider_SRCS kde4_add_plugin( plasma_potd_oseiprovider ${potd_osei_provider_SRCS} ) target_link_libraries( plasma_potd_oseiprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ) -install( TARGETS plasma_potd_oseiprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES oseiprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_potd_oseiprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES oseiprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) set( potd_wcpotd_provider_SRCS @@ -71,5 +71,5 @@ set( potd_wcpotd_provider_SRCS kde4_add_plugin( plasma_potd_wcpotdprovider ${potd_wcpotd_provider_SRCS} ) target_link_libraries( plasma_potd_wcpotdprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ) -install( TARGETS plasma_potd_wcpotdprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES wcpotdprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( TARGETS plasma_potd_wcpotdprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) +install( FILES wcpotdprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt b/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt index 6bda4870..963efc33 100644 --- a/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt +++ b/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt @@ -64,7 +64,7 @@ if (NOT EXISTS ${screensaver_xml}) endif (NOT EXISTS ${screensaver_xml}) qt4_add_dbus_interface(lancelot_datamodels_LIB_SRCS ${screensaver_xml} screensaver_interface) -set(kopete_xml ${DBUS_INTERFACES_INSTALL_DIR}/org.kde.Kopete.xml) +set(kopete_xml ${KDE4_DBUS_INTERFACES_INSTALL_DIR}/org.kde.Kopete.xml) if (NOT EXISTS ${kopete_xml}) set(kopete_xml external/org.kde.Kopete.xml) endif (NOT EXISTS ${kopete_xml}) @@ -113,7 +113,7 @@ set(lancelot_datamodels_LIB_INCLUDES install(FILES ${lancelot_datamodels_LIB_INCLUDES} - DESTINATION ${INCLUDE_INSTALL_DIR}/lancelot-datamodels COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/lancelot-datamodels COMPONENT Devel ) install(FILES @@ -136,6 +136,6 @@ install(FILES Lancelot/Models/SystemActions Lancelot/Models/SystemServices Lancelot/Models/XbelModel - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Lancelot/Models COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Lancelot/Models COMPONENT Devel ) diff --git a/kdeplasma-addons/libs/lancelot/CMakeLists.txt b/kdeplasma-addons/libs/lancelot/CMakeLists.txt index ec88ab2a..947837f8 100644 --- a/kdeplasma-addons/libs/lancelot/CMakeLists.txt +++ b/kdeplasma-addons/libs/lancelot/CMakeLists.txt @@ -99,7 +99,7 @@ set(lancelot_LIB_INCLUDES install(FILES ${lancelot_LIB_INCLUDES} - DESTINATION ${INCLUDE_INSTALL_DIR}/lancelot COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/lancelot COMPONENT Devel ) install(FILES @@ -117,7 +117,7 @@ install(FILES widgets/PopupMenu.h widgets/ScrollPane.h widgets/ScrollBar.h - DESTINATION ${INCLUDE_INSTALL_DIR}/lancelot/widgets COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/lancelot/widgets COMPONENT Devel) install(FILES layouts/FullBorderLayout.h @@ -125,7 +125,7 @@ install(FILES layouts/CardLayout.h layouts/ColumnLayout.h layouts/FlipLayout.h - DESTINATION ${INCLUDE_INSTALL_DIR}/lancelot/layouts COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/lancelot/layouts COMPONENT Devel) install(FILES models/ActionListModel.h @@ -140,7 +140,7 @@ install(FILES # models/ActionListViewModels.h # models/PassagewayViewModels.h - DESTINATION ${INCLUDE_INSTALL_DIR}/lancelot/models COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/lancelot/models COMPONENT Devel) install(FILES Lancelot/ActionListModel @@ -171,7 +171,7 @@ install(FILES Lancelot/StandardActionListModel Lancelot/StandardActionTreeModel Lancelot/Widget - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Lancelot COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Lancelot COMPONENT Devel) # tests # add_subdirectory(tests) diff --git a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt index 5af3a88c..7d440e4d 100644 --- a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt +++ b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt @@ -21,6 +21,6 @@ target_link_libraries(plasmaweather ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE set_target_properties(plasmaweather PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS plasmaweather ${INSTALL_TARGETS_DEFAULT_ARGS}) # nothing outside of kdeplasma-addons uses this library, and the API is not stable -> do not install headers! -#install(FILES ${plasmaweather_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaweather COMPONENT Devel) +#install(FILES ${plasmaweather_HEADERS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaweather COMPONENT Devel) -install(FILES plasmaweather.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES plasmaweather.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt b/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt index d30c2061..4b78e75f 100644 --- a/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt +++ b/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt @@ -21,5 +21,5 @@ kde4_add_plugin(krunner_audioplayercontrol ${krunner_audioplayercontrol_SRCS}) target_link_libraries(krunner_audioplayercontrol ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_audioplayercontrol kcm_krunner_audioplayercontrol DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-audioplayercontrol.desktop plasma-runner-audioplayercontrol_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS krunner_audioplayercontrol kcm_krunner_audioplayercontrol DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-runner-audioplayercontrol.desktop plasma-runner-audioplayercontrol_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/browserhistory/CMakeLists.txt b/kdeplasma-addons/runners/browserhistory/CMakeLists.txt index a39cb82a..c657c893 100644 --- a/kdeplasma-addons/runners/browserhistory/CMakeLists.txt +++ b/kdeplasma-addons/runners/browserhistory/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_browserhistory_SRCS kde4_add_plugin(krunner_browserhistory ${krunner_browserhistory_SRCS}) target_link_libraries(krunner_browserhistory ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS krunner_browserhistory DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_browserhistory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES browserhistory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES browserhistory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/characters/CMakeLists.txt b/kdeplasma-addons/runners/characters/CMakeLists.txt index dc075595..8a389b2f 100644 --- a/kdeplasma-addons/runners/characters/CMakeLists.txt +++ b/kdeplasma-addons/runners/characters/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(krunner_charrunner ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) add_dependencies(krunner_charrunner kcm_krunner_charrunner) # Install the library and .desktop file -install(TARGETS krunner_charrunner kcm_krunner_charrunner DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES CharacterRunner.desktop CharRunner_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS krunner_charrunner kcm_krunner_charrunner DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES CharacterRunner.desktop CharRunner_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/converter/CMakeLists.txt b/kdeplasma-addons/runners/converter/CMakeLists.txt index 6ed9aad2..b73e4d3a 100644 --- a/kdeplasma-addons/runners/converter/CMakeLists.txt +++ b/kdeplasma-addons/runners/converter/CMakeLists.txt @@ -6,6 +6,6 @@ set(krunner_converter_SRCS kde4_add_plugin(krunner_converter ${krunner_converter_SRCS}) target_link_libraries(krunner_converter ${KDE4_KUNITCONVERSION_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_converter DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-converter.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS krunner_converter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-runner-converter.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/datetime/CMakeLists.txt b/kdeplasma-addons/runners/datetime/CMakeLists.txt index 4b9ba3d1..66d8ae6f 100644 --- a/kdeplasma-addons/runners/datetime/CMakeLists.txt +++ b/kdeplasma-addons/runners/datetime/CMakeLists.txt @@ -7,5 +7,5 @@ set(plasma_runner_datetime_SRCS kde4_add_plugin(plasma_runner_datetime ${plasma_runner_datetime_SRCS}) target_link_libraries(plasma_runner_datetime ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_runner_datetime DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-datetime.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_runner_datetime DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-runner-datetime.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/dictionary/CMakeLists.txt b/kdeplasma-addons/runners/dictionary/CMakeLists.txt index 5c31708f..85bbf131 100644 --- a/kdeplasma-addons/runners/dictionary/CMakeLists.txt +++ b/kdeplasma-addons/runners/dictionary/CMakeLists.txt @@ -7,5 +7,5 @@ kde4_add_plugin(kcm_krunner_dictionary ${kcm_dictionaryrunner_SRCS}) target_link_libraries(krunner_dictionary ${KDE4_PLASMA_LIBS}) target_link_libraries(kcm_krunner_dictionary ${KDE4_KCMUTILS_LIBS}) -install(TARGETS krunner_dictionary kcm_krunner_dictionary DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-dictionary.desktop plasma-runner-dictionary_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS krunner_dictionary kcm_krunner_dictionary DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-runner-dictionary.desktop plasma-runner-dictionary_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/katesessions/CMakeLists.txt b/kdeplasma-addons/runners/katesessions/CMakeLists.txt index 2ecaa1b2..69df7983 100644 --- a/kdeplasma-addons/runners/katesessions/CMakeLists.txt +++ b/kdeplasma-addons/runners/katesessions/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_katesessions_SRCS kde4_add_plugin(krunner_katesessions ${krunner_katesessions_SRCS}) target_link_libraries(krunner_katesessions ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS krunner_katesessions DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_katesessions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES katesessions.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES katesessions.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt b/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt index c1d5cea9..94e8a026 100644 --- a/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt +++ b/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_konsolesessions_SRCS kde4_add_plugin(krunner_konsolesessions ${krunner_konsolesessions_SRCS}) target_link_libraries(krunner_konsolesessions ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS krunner_konsolesessions DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_konsolesessions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES konsolesessions.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES konsolesessions.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/kopete/CMakeLists.txt b/kdeplasma-addons/runners/kopete/CMakeLists.txt index 1f61fe9d..948e16f4 100644 --- a/kdeplasma-addons/runners/kopete/CMakeLists.txt +++ b/kdeplasma-addons/runners/kopete/CMakeLists.txt @@ -20,12 +20,12 @@ install( TARGETS krunner_kopete DESTINATION - ${PLUGIN_INSTALL_DIR} + ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-runner-kopete.desktop DESTINATION - ${SERVICES_INSTALL_DIR} + ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeplasma-addons/runners/mediawiki/CMakeLists.txt b/kdeplasma-addons/runners/mediawiki/CMakeLists.txt index d6a44336..212abbef 100644 --- a/kdeplasma-addons/runners/mediawiki/CMakeLists.txt +++ b/kdeplasma-addons/runners/mediawiki/CMakeLists.txt @@ -6,14 +6,14 @@ set(krunner_mediawiki_SRCS kde4_add_plugin(krunner_mediawiki ${krunner_mediawiki_SRCS}) target_link_libraries(krunner_mediawiki ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS krunner_mediawiki DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS krunner_mediawiki DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install(FILES plasma-runner-wikipedia.desktop plasma-runner-wikitravel.desktop plasma-runner-techbase.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) # doesn't seem to work, maybe XML API is disabled -#install(FILES plasma-runner-userbase.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +#install(FILES plasma-runner-userbase.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/spellchecker/CMakeLists.txt b/kdeplasma-addons/runners/spellchecker/CMakeLists.txt index 9f773040..ef44e596 100644 --- a/kdeplasma-addons/runners/spellchecker/CMakeLists.txt +++ b/kdeplasma-addons/runners/spellchecker/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries(kcm_krunner_spellcheck kde4_add_plugin(krunner_spellcheckrunner ${krunner_spellcheckrunner_SRCS}) target_link_libraries(krunner_spellcheckrunner ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS krunner_spellcheckrunner kcm_krunner_spellcheck DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-spellchecker.desktop plasma-runner-spellchecker_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS krunner_spellcheckrunner kcm_krunner_spellcheck DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-runner-spellchecker.desktop plasma-runner-spellchecker_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/runners/translator/CMakeLists.txt b/kdeplasma-addons/runners/translator/CMakeLists.txt index 96553410..5c0c3903 100644 --- a/kdeplasma-addons/runners/translator/CMakeLists.txt +++ b/kdeplasma-addons/runners/translator/CMakeLists.txt @@ -12,9 +12,9 @@ target_link_libraries(krunner_translator install( TARGETS krunner_translator - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-runner-translator.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeplasma-addons/runners/youtube/CMakeLists.txt b/kdeplasma-addons/runners/youtube/CMakeLists.txt index 9daeb424..c9118cfa 100644 --- a/kdeplasma-addons/runners/youtube/CMakeLists.txt +++ b/kdeplasma-addons/runners/youtube/CMakeLists.txt @@ -14,10 +14,10 @@ target_link_libraries(krunner_youtube install( TARGETS krunner_youtube - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install( FILES plasma-runner-youtube.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kdeplasma-addons/runners/youtube/icons/CMakeLists.txt b/kdeplasma-addons/runners/youtube/icons/CMakeLists.txt index 29893960..b15d94c3 100644 --- a/kdeplasma-addons/runners/youtube/icons/CMakeLists.txt +++ b/kdeplasma-addons/runners/youtube/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) \ No newline at end of file +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) \ No newline at end of file diff --git a/kdeplasma-addons/wallpapers/mandelbrot/CMakeLists.txt b/kdeplasma-addons/wallpapers/mandelbrot/CMakeLists.txt index 6bc10c2d..78b95020 100644 --- a/kdeplasma-addons/wallpapers/mandelbrot/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/mandelbrot/CMakeLists.txt @@ -83,7 +83,7 @@ set_source_files_properties( kde4_add_plugin(plasma_wallpaper_mandelbrot ${mandelbrot_SRCS}) target_link_libraries(plasma_wallpaper_mandelbrot ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) -install(TARGETS plasma_wallpaper_mandelbrot DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-mandelbrot.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_mandelbrot DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-mandelbrot.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endif(EIGEN2_FOUND) diff --git a/kdeplasma-addons/wallpapers/marble/CMakeLists.txt b/kdeplasma-addons/wallpapers/marble/CMakeLists.txt index 4f1b9038..3c0bbf2d 100644 --- a/kdeplasma-addons/wallpapers/marble/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/marble/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(plasma_wallpaper_marble ${KDE4_KDECORE_LIBS} ) -install(TARGETS plasma_wallpaper_marble DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-marble.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_marble DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-marble.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt b/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt index 1ecb5864..5e574a08 100644 --- a/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt @@ -11,12 +11,12 @@ set(pattern_SRCS kde4_add_plugin(plasma_wallpaper_pattern ${pattern_SRCS}) target_link_libraries(plasma_wallpaper_pattern ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS}) -install(TARGETS plasma_wallpaper_pattern DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-pattern.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_pattern DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-pattern.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) FILE(GLOB pattern_desktop patterns/*.desktop) FILE(GLOB pattern_png patterns/*.jpg) FILE(GLOB pattern_jpg patterns/*.png) -INSTALL(FILES ${pattern_desktop} ${pattern_png} ${pattern_jpg} DESTINATION ${DATA_INSTALL_DIR}/plasma_wallpaper_pattern/patterns) +INSTALL(FILES ${pattern_desktop} ${pattern_png} ${pattern_jpg} DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma_wallpaper_pattern/patterns) diff --git a/kdeplasma-addons/wallpapers/potd/CMakeLists.txt b/kdeplasma-addons/wallpapers/potd/CMakeLists.txt index e0761caf..50978490 100644 --- a/kdeplasma-addons/wallpapers/potd/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/potd/CMakeLists.txt @@ -8,5 +8,5 @@ set(potd_SRCS kde4_add_plugin(plasma_wallpaper_potd ${potd_SRCS}) target_link_libraries(plasma_wallpaper_potd ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS plasma_wallpaper_potd DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-potd.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_potd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-potd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt b/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt index f2124d78..64080cc7 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(plasma_wallpaper_qml ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} kdeclarative ) -install(TARGETS plasma_wallpaper_qml DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-qml.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_qml DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-qml.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) add_subdirectory(wallpapers) diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapers/CMakeLists.txt b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapers/CMakeLists.txt index 4149d0e6..fa4eadc7 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapers/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapers/CMakeLists.txt @@ -1,3 +1,3 @@ -install(DIRECTORY animals/ DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.animals) -install(DIRECTORY haenau/ DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.haenau) -install(DIRECTORY hunyango/ DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.hunyango) +install(DIRECTORY animals/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.animals) +install(DIRECTORY haenau/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.haenau) +install(DIRECTORY hunyango/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.hunyango) diff --git a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt index 0d484c5d..6b4218d4 100644 --- a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt @@ -15,7 +15,7 @@ qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface) kde4_add_plugin(plasma_wallpaper_virus ${virus_SRCS}) target_link_libraries(plasma_wallpaper_virus ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) -install(TARGETS plasma_wallpaper_virus DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-virus.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_virus DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-virus.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES virus_wallpaper.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES virus_wallpaper.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) diff --git a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt index 87761fcf..5cd4845d 100644 --- a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt @@ -9,5 +9,5 @@ set(weather_SRCS kde4_add_plugin(plasma_wallpaper_weather ${weather_SRCS}) target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} plasmaweather) -install(TARGETS plasma_wallpaper_weather DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-wallpaper-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_wallpaper_weather DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-wallpaper-weather.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kfilemetadata/CMakeLists.txt b/kfilemetadata/CMakeLists.txt index a14910f2..e956417f 100644 --- a/kfilemetadata/CMakeLists.txt +++ b/kfilemetadata/CMakeLists.txt @@ -53,4 +53,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/KFileMetaDataConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KFileMetaDataConfig.cmake @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KFileMetaDataConfig.cmake - DESTINATION ${LIB_INSTALL_DIR}/cmake/KFileMetaData) + DESTINATION ${KDE4_LIB_INSTALL_DIR}/cmake/KFileMetaData) diff --git a/kfilemetadata/KFileMetaDataConfig.cmake.in b/kfilemetadata/KFileMetaDataConfig.cmake.in index 45cf0399..cccbaf3e 100644 --- a/kfilemetadata/KFileMetaDataConfig.cmake.in +++ b/kfilemetadata/KFileMetaDataConfig.cmake.in @@ -9,7 +9,7 @@ get_filename_component(rootDir ${_currentDir}/@relInstallDir@ ABSOLUTE) # The in # Include directory set(KFILEMETADATA_INSTALL_PREFIX "${rootDir}") -set(KFILEMETADATA_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@") +set(KFILEMETADATA_INCLUDE_DIR "@KDE4_INCLUDE_INSTALL_DIR@") include(${_currentDir}/KFileMetaDataTargetsWithPrefix.cmake) diff --git a/kfilemetadata/src/CMakeLists.txt b/kfilemetadata/src/CMakeLists.txt index b3e7e32e..7f6500ed 100644 --- a/kfilemetadata/src/CMakeLists.txt +++ b/kfilemetadata/src/CMakeLists.txt @@ -19,10 +19,10 @@ set_target_properties(kfilemetadata PROPERTIES install(TARGETS kfilemetadata ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kfilemetadata EXPORT KdeLibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES kfilemetadataextractor.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES kfilemetadataextractor.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) install(EXPORT KdeLibsLibraryTargets - DESTINATION ${LIB_INSTALL_DIR}/cmake/KFileMetaData + DESTINATION ${KDE4_LIB_INSTALL_DIR}/cmake/KFileMetaData FILE KFileMetaDataTargetsWithPrefix.cmake) install(FILES @@ -34,7 +34,7 @@ install(FILES types.h typeinfo.h kfilemetadata_export.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kfilemetadata + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kfilemetadata COMPONENT Devel ) diff --git a/kfilemetadata/src/extractors/CMakeLists.txt b/kfilemetadata/src/extractors/CMakeLists.txt index 1e26003e..ca274046 100644 --- a/kfilemetadata/src/extractors/CMakeLists.txt +++ b/kfilemetadata/src/extractors/CMakeLists.txt @@ -11,11 +11,11 @@ if(POPPLER_QT4_FOUND) install( FILES kfilemetadata_popplerextractor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_popplerextractor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(POPPLER_QT4_FOUND) @@ -32,11 +32,11 @@ if(TAGLIB_FOUND) install( FILES kfilemetadata_taglibextractor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_taglibextractor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(TAGLIB_FOUND) @@ -57,11 +57,11 @@ if(EXIV2_FOUND) install( FILES kfilemetadata_exiv2extractor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_exiv2extractor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(EXIV2_FOUND) @@ -79,11 +79,11 @@ if(FFMPEG_FOUND) install( FILES kfilemetadata_ffmpegextractor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_ffmpegextractor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(FFMPEG_FOUND) @@ -101,11 +101,11 @@ if(EPUB_FOUND) install( FILES kfilemetadata_epubextractor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_epubextractor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(EPUB_FOUND) @@ -121,11 +121,11 @@ target_link_libraries( kfilemetadata_plaintextextractor install( FILES kfilemetadata_plaintextextractor.desktop -DESTINATION ${SERVICES_INSTALL_DIR}) +DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_plaintextextractor -DESTINATION ${PLUGIN_INSTALL_DIR}) +DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) # # ODF @@ -140,11 +140,11 @@ target_link_libraries(kfilemetadata_odfextractor install( FILES kfilemetadata_odfextractor.desktop -DESTINATION ${SERVICES_INSTALL_DIR}) +DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_odfextractor -DESTINATION ${PLUGIN_INSTALL_DIR}) +DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) # # Office 2007 @@ -159,11 +159,11 @@ target_link_libraries(kfilemetadata_office2007extractor install( FILES kfilemetadata_office2007extractor.desktop -DESTINATION ${SERVICES_INSTALL_DIR}) +DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_office2007extractor -DESTINATION ${PLUGIN_INSTALL_DIR}) +DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) # # Office (binary formats) @@ -178,11 +178,11 @@ target_link_libraries(kfilemetadata_officeextractor install( FILES kfilemetadata_officeextractor.desktop -DESTINATION ${SERVICES_INSTALL_DIR}) +DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_officeextractor -DESTINATION ${PLUGIN_INSTALL_DIR}) +DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) # # Mobipocket @@ -199,9 +199,9 @@ if (QMOBIPOCKET_FOUND) install( FILES kfilemetadata_mobiextractor.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install( TARGETS kfilemetadata_mobiextractor - DESTINATION ${PLUGIN_INSTALL_DIR}) + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) endif(QMOBIPOCKET_FOUND) diff --git a/kfloppy/CMakeLists.txt b/kfloppy/CMakeLists.txt index 90e6be1f..5c2b1ce5 100644 --- a/kfloppy/CMakeLists.txt +++ b/kfloppy/CMakeLists.txt @@ -22,10 +22,10 @@ install(TARGETS kfloppy ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS KFloppy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( PROGRAMS KFloppy.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) # The mimetypes used in this servicemenu (e.g. floppy_unmounted) don't exist anymore. # This needs to be done differently. -#install( FILES floppy_format.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) +#install( FILES floppy_format.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kfloppy/CTestConfig.cmake b/kfloppy/CTestConfig.cmake deleted file mode 100644 index d47777b3..00000000 --- a/kfloppy/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "kfloppy") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=kfloppy") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt index 01fe7996..9b64344e 100644 --- a/kget/CMakeLists.txt +++ b/kget/CMakeLists.txt @@ -225,4 +225,4 @@ endif(QGPGME_FOUND) install(TARGETS kget ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES kget.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kget) \ No newline at end of file +install(FILES kget.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget) \ No newline at end of file diff --git a/kget/conf/CMakeLists.txt b/kget/conf/CMakeLists.txt index 80cf3629..a7fcd03f 100644 --- a/kget/conf/CMakeLists.txt +++ b/kget/conf/CMakeLists.txt @@ -1 +1 @@ -install(FILES kget.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES kget.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/kget/core/plugin/CMakeLists.txt b/kget/core/plugin/CMakeLists.txt index 48f47fca..057fa848 100644 --- a/kget/core/plugin/CMakeLists.txt +++ b/kget/core/plugin/CMakeLists.txt @@ -1 +1 @@ -install(FILES kget_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES kget_plugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) diff --git a/kget/desktop/CMakeLists.txt b/kget/desktop/CMakeLists.txt index ac150a6b..83747afe 100644 --- a/kget/desktop/CMakeLists.txt +++ b/kget/desktop/CMakeLists.txt @@ -1,12 +1,12 @@ # associate KGet with the correct mimetypes configure_file(kget.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kget.desktop) -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kget.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kget.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) install(FILES kget_download.desktop DESTINATION -${SERVICES_INSTALL_DIR}/ServiceMenus) +${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus) # For DBus activation: configure_file(org.kde.kget.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kget.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kget.service - DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR}) diff --git a/kget/extensions/konqueror/CMakeLists.txt b/kget/extensions/konqueror/CMakeLists.txt index 0b29ca66..3cfa20b2 100644 --- a/kget/extensions/konqueror/CMakeLists.txt +++ b/kget/extensions/konqueror/CMakeLists.txt @@ -10,9 +10,9 @@ kde4_add_plugin(kget_browser_integration ${kget_browser_integration_SRCS}) target_link_libraries(kget_browser_integration ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBRARY}) -install(TARGETS kget_browser_integration DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kget_browser_integration DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES kget_plug_in.rc kget_plug_in.desktop DESTINATION ${DATA_INSTALL_DIR}/dolphinpart/kpartplugins) -install(FILES kget_plug_in.rc kget_plug_in.desktop DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart/kpartplugins) +install(FILES kget_plug_in.rc kget_plug_in.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/dolphinpart/kpartplugins) +install(FILES kget_plug_in.rc kget_plug_in.desktop DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwebkitpart/kpartplugins) diff --git a/kget/extensions/webinterface/www/CMakeLists.txt b/kget/extensions/webinterface/www/CMakeLists.txt index f5a67bc2..4b00c422 100644 --- a/kget/extensions/webinterface/www/CMakeLists.txt +++ b/kget/extensions/webinterface/www/CMakeLists.txt @@ -15,4 +15,4 @@ set(www_data view-refresh.png ) -install(FILES ${www_data} DESTINATION ${DATA_INSTALL_DIR}/kget/www) +install(FILES ${www_data} DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget/www) diff --git a/kget/plasma/applet/CMakeLists.txt b/kget/plasma/applet/CMakeLists.txt index 3fa3ca19..6cb3dd97 100644 --- a/kget/plasma/applet/CMakeLists.txt +++ b/kget/plasma/applet/CMakeLists.txt @@ -15,7 +15,7 @@ qt4_add_dbus_interface(kgetbarapplet_SRCS ../../dbus/org.kde.kget.main.xml kget_ kde4_add_plugin(plasma_kget_barapplet ${kgetbarapplet_SRCS}) target_link_libraries(plasma_kget_barapplet ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) -install(TARGETS plasma_kget_barapplet DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_kget_barapplet DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) #set(kgetpanelbar_SRCS @@ -28,7 +28,7 @@ install(TARGETS plasma_kget_barapplet DESTINATION ${PLUGIN_INSTALL_DIR}) #kde4_add_plugin(plasma_kget_panelbar ${kgetpanelbar_SRCS}) #target_link_libraries(plasma_kget_panelbar ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) # -#install(TARGETS plasma_kget_panelbar DESTINATION ${PLUGIN_INSTALL_DIR}) +#install(TARGETS plasma_kget_panelbar DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) set(kgetpiechart_SRCS piechart/kgetpiechart.cpp @@ -40,9 +40,9 @@ qt4_add_dbus_interface(kgetpiechart_SRCS ../../dbus/org.kde.kget.main.xml kget_i kde4_add_plugin(plasma_kget_piechart ${kgetpiechart_SRCS}) target_link_libraries(plasma_kget_piechart ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) -install(TARGETS plasma_kget_piechart DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS plasma_kget_piechart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES barapplet/kgetbarapplet-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -#install(FILES panelbar/kgetpanelbarapplet-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES piechart/kgetpiechartapplet-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES barapplet/kgetbarapplet-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +#install(FILES panelbar/kgetpanelbarapplet-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES piechart/kgetpiechartapplet-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/plasma/engine/CMakeLists.txt b/kget/plasma/engine/CMakeLists.txt index d9b5eb78..52a7d7d8 100644 --- a/kget/plasma/engine/CMakeLists.txt +++ b/kget/plasma/engine/CMakeLists.txt @@ -9,5 +9,5 @@ qt4_add_dbus_interface(kget_engine_SRCS ../../dbus/org.kde.kget.main.xml kget_in kde4_add_plugin(plasma_engine_kget ${kget_engine_SRCS}) target_link_libraries(plasma_engine_kget ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_engine_kget DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-engine-kget.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_engine_kget DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-engine-kget.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/plasma/runner/CMakeLists.txt b/kget/plasma/runner/CMakeLists.txt index 7f56f8f1..fc84f0d9 100644 --- a/kget/plasma/runner/CMakeLists.txt +++ b/kget/plasma/runner/CMakeLists.txt @@ -13,9 +13,9 @@ target_link_libraries(krunner_kget install(TARGETS krunner_kget - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install(FILES plasma-runner-kget.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kget/transfer-plugins/bittorrent/CMakeLists.txt b/kget/transfer-plugins/bittorrent/CMakeLists.txt index f03a6951..457985b2 100644 --- a/kget/transfer-plugins/bittorrent/CMakeLists.txt +++ b/kget/transfer-plugins/bittorrent/CMakeLists.txt @@ -43,8 +43,8 @@ kde4_add_kcfg_files(kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc) kde4_add_plugin(kget_bittorrentfactory ${kget_bittorrentfactory_PART_SRCS}) target_link_libraries(kget_bittorrentfactory ${KDE4_KIO_LIBS} ktorrent kgetcore) -install(TARGETS kget_bittorrentfactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_bittorrentfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kget_bittorrentfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_bittorrentfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_bittorrentfactory_PART_SRCS @@ -55,6 +55,6 @@ set(kcm_kget_bittorrentfactory_PART_SRCS kde4_add_kcfg_files(kcm_kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc) kde4_add_plugin(kcm_kget_bittorrentfactory ${kcm_kget_bittorrentfactory_PART_SRCS}) target_link_libraries(kcm_kget_bittorrentfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_kget_bittorrentfactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_bittorrentfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_bittorrentfactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_bittorrentfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/checksumsearch/CMakeLists.txt b/kget/transfer-plugins/checksumsearch/CMakeLists.txt index df253398..acbfe3eb 100644 --- a/kget/transfer-plugins/checksumsearch/CMakeLists.txt +++ b/kget/transfer-plugins/checksumsearch/CMakeLists.txt @@ -14,9 +14,9 @@ kde4_add_plugin(kget_checksumsearchfactory ${kget_checksumsearchfactory_PART_SRC target_link_libraries(kget_checksumsearchfactory ${KDE4_KIO_LIBS} kgetcore) -install(TARGETS kget_checksumsearchfactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_checksumsearchfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES kget_checksumsearchfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(TARGETS kget_checksumsearchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_checksumsearchfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES kget_checksumsearchfactory.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_checksumsearchfactory_PART_SRCS @@ -29,6 +29,6 @@ set(kcm_kget_checksumsearchfactory_PART_SRCS kde4_add_kcfg_files(kcm_kget_checksumsearchfactory_PART_SRCS checksumsearchsettings.kcfgc) kde4_add_plugin(kcm_kget_checksumsearchfactory ${kcm_kget_checksumsearchfactory_PART_SRCS}) target_link_libraries(kcm_kget_checksumsearchfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kgetcore) -install(TARGETS kcm_kget_checksumsearchfactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_checksumsearchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_checksumsearchfactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_checksumsearchfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/contentfetch/CMakeLists.txt b/kget/transfer-plugins/contentfetch/CMakeLists.txt index d9664247..e82ec69d 100644 --- a/kget/transfer-plugins/contentfetch/CMakeLists.txt +++ b/kget/transfer-plugins/contentfetch/CMakeLists.txt @@ -19,9 +19,9 @@ kde4_add_plugin(kget_contentfetchfactory ${kget_contentfetchfactory_PART_SRCS}) target_link_libraries(kget_contentfetchfactory ${KDE4_KIO_LIBS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBS} kgetcore) -install(TARGETS kget_contentfetchfactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_contentfetchfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES kget_contentfetchfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(TARGETS kget_contentfetchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_contentfetchfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES kget_contentfetchfactory.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_contentfetchfactory_PART_SRCS @@ -39,6 +39,6 @@ kde4_add_kcfg_files(kcm_kget_contentfetchfactory_PART_SRCS contentfetchsetting.k kde4_add_plugin(kcm_kget_contentfetchfactory ${kcm_kget_contentfetchfactory_PART_SRCS}) target_link_libraries(kcm_kget_contentfetchfactory ${KDE4_KIO_LIBS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBS}) -install(TARGETS kcm_kget_contentfetchfactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_contentfetchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_contentfetchfactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_contentfetchfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/contentfetch/scripts/CMakeLists.txt b/kget/transfer-plugins/contentfetch/scripts/CMakeLists.txt index 4dfcbb75..8970e2f9 100644 --- a/kget/transfer-plugins/contentfetch/scripts/CMakeLists.txt +++ b/kget/transfer-plugins/contentfetch/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ -install(FILES youtubedl/kget_youtubedl.py DESTINATION ${DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) -install(FILES youtubedl/kget_youtubedl_option.py DESTINATION ${DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) -install(FILES youtubedl/ui_youtube_option.py DESTINATION ${DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) -install(FILES youtubedl/youtube_option.ui DESTINATION ${DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) \ No newline at end of file +install(FILES youtubedl/kget_youtubedl.py DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) +install(FILES youtubedl/kget_youtubedl_option.py DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) +install(FILES youtubedl/ui_youtube_option.py DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) +install(FILES youtubedl/youtube_option.ui DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget/content_fetch_scripts/youtubedl) \ No newline at end of file diff --git a/kget/transfer-plugins/kio/CMakeLists.txt b/kget/transfer-plugins/kio/CMakeLists.txt index e8085b3a..f9af5572 100644 --- a/kget/transfer-plugins/kio/CMakeLists.txt +++ b/kget/transfer-plugins/kio/CMakeLists.txt @@ -12,5 +12,5 @@ kde4_add_plugin(kget_kiofactory ${kget_kiofactory_PART_SRCS}) target_link_libraries(kget_kiofactory ${KDE4_KIO_LIBS} kgetcore) -install(TARGETS kget_kiofactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_kiofactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kget_kiofactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_kiofactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/metalink/CMakeLists.txt b/kget/transfer-plugins/metalink/CMakeLists.txt index 8826e160..52ee0bfb 100644 --- a/kget/transfer-plugins/metalink/CMakeLists.txt +++ b/kget/transfer-plugins/metalink/CMakeLists.txt @@ -21,8 +21,8 @@ kde4_add_plugin(kget_metalinkfactory ${kget_metalinkfactory_PART_SRCS}) target_link_libraries(kget_metalinkfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kgetcore) -install(TARGETS kget_metalinkfactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_metalinkfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kget_metalinkfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_metalinkfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) ###Build KCM-Module @@ -34,6 +34,6 @@ set(kcm_kget_metalinkfactory_PART_SRCS kde4_add_kcfg_files(kcm_kget_metalinkfactory_PART_SRCS metalinksettings.kcfgc) kde4_add_plugin(kcm_kget_metalinkfactory ${kcm_kget_metalinkfactory_PART_SRCS}) target_link_libraries(kcm_kget_metalinkfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_kget_metalinkfactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_metalinkfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_metalinkfactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_metalinkfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/mirrorsearch/CMakeLists.txt b/kget/transfer-plugins/mirrorsearch/CMakeLists.txt index bc95d730..4aab7196 100644 --- a/kget/transfer-plugins/mirrorsearch/CMakeLists.txt +++ b/kget/transfer-plugins/mirrorsearch/CMakeLists.txt @@ -14,9 +14,9 @@ kde4_add_plugin(kget_mirrorsearchfactory ${kget_mirrorsearchfactory_PART_SRCS}) target_link_libraries(kget_mirrorsearchfactory ${KDE4_KIO_LIBS} kgetcore) -install(TARGETS kget_mirrorsearchfactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_mirrorsearchfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES kget_mirrorsearchfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(TARGETS kget_mirrorsearchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_mirrorsearchfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES kget_mirrorsearchfactory.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_mirrorsearchfactory_PART_SRCS @@ -28,6 +28,6 @@ set(kcm_kget_mirrorsearchfactory_PART_SRCS kde4_add_kcfg_files(kcm_kget_mirrorsearchfactory_PART_SRCS mirrorsearchsettings.kcfgc) kde4_add_plugin(kcm_kget_mirrorsearchfactory ${kcm_kget_mirrorsearchfactory_PART_SRCS}) target_link_libraries(kcm_kget_mirrorsearchfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_kget_mirrorsearchfactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_mirrorsearchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_mirrorsearchfactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_mirrorsearchfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/mmsthreads/CMakeLists.txt b/kget/transfer-plugins/mmsthreads/CMakeLists.txt index c9ae965c..b451d19b 100755 --- a/kget/transfer-plugins/mmsthreads/CMakeLists.txt +++ b/kget/transfer-plugins/mmsthreads/CMakeLists.txt @@ -15,9 +15,9 @@ kde4_add_plugin(kget_mmsfactory ${kget_mmsfactory_PART_SRCS}) target_link_libraries(kget_mmsfactory ${KDE4_KIO_LIBS} kgetcore ${LIBMMS_LIBRARIES}) -install(TARGETS kget_mmsfactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_mmsfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES kget_mmsfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(TARGETS kget_mmsfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_mmsfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES kget_mmsfactory.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_mmsfactory_PART_SRCS @@ -27,6 +27,6 @@ set(kcm_kget_mmsfactory_PART_SRCS kde4_add_kcfg_files(kcm_kget_mmsfactory_PART_SRCS mmssettings.kcfgc) kde4_add_plugin(kcm_kget_mmsfactory ${kcm_kget_mmsfactory_PART_SRCS}) target_link_libraries(kcm_kget_mmsfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_kget_mmsfactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_mmsfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_mmsfactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_mmsfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/transfer-plugins/multisegmentkio/CMakeLists.txt b/kget/transfer-plugins/multisegmentkio/CMakeLists.txt index 965c0b5a..790467b0 100644 --- a/kget/transfer-plugins/multisegmentkio/CMakeLists.txt +++ b/kget/transfer-plugins/multisegmentkio/CMakeLists.txt @@ -15,9 +15,9 @@ kde4_add_plugin(kget_multisegkiofactory ${kget_multisegkiofactory_PART_SRCS}) target_link_libraries(kget_multisegkiofactory ${KDE4_KIO_LIBS} kgetcore) -install(TARGETS kget_multisegkiofactory DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kget_multisegkiofactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES kget_multisegkiofactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(TARGETS kget_multisegkiofactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kget_multisegkiofactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES kget_multisegkiofactory.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_multisegkiofactory_PART_SRCS @@ -28,6 +28,6 @@ set(kcm_kget_multisegkiofactory_PART_SRCS kde4_add_kcfg_files(kcm_kget_multisegkiofactory_PART_SRCS multisegkiosettings.kcfgc) kde4_add_plugin(kcm_kget_multisegkiofactory ${kcm_kget_multisegkiofactory_PART_SRCS}) target_link_libraries(kcm_kget_multisegkiofactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -install(TARGETS kcm_kget_multisegkiofactory DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kget_multisegkiofactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) -install(FILES kget_multisegkiofactory_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kget_multisegkiofactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/kget/ui/CMakeLists.txt b/kget/ui/CMakeLists.txt index abb45ed7..3c36722a 100644 --- a/kget/ui/CMakeLists.txt +++ b/kget/ui/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(icons) add_subdirectory(pics) -install(FILES kgetui.rc DESTINATION ${DATA_INSTALL_DIR}/kget) +install(FILES kgetui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget) diff --git a/kget/ui/icons/CMakeLists.txt b/kget/ui/icons/CMakeLists.txt index 02e3c9ec..64266d49 100644 --- a/kget/ui/icons/CMakeLists.txt +++ b/kget/ui/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kget/ui/pics/CMakeLists.txt b/kget/ui/pics/CMakeLists.txt index 7bdba370..ddc24e0b 100644 --- a/kget/ui/pics/CMakeLists.txt +++ b/kget/ui/pics/CMakeLists.txt @@ -1 +1 @@ -install(FILES kget_splash.png DESTINATION ${DATA_INSTALL_DIR}/kget/pics) +install(FILES kget_splash.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget/pics) diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt index 4754097c..e1f76704 100644 --- a/kgpg/CMakeLists.txt +++ b/kgpg/CMakeLists.txt @@ -150,11 +150,11 @@ install(TARGETS kgpg ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES editor/kgpgeditor.rc keysmanager.rc tips - DESTINATION ${DATA_INSTALL_DIR}/kgpg + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kgpg ) install( PROGRAMS kgpg.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) install( FILES kgpg.appdata.xml @@ -162,19 +162,19 @@ install( ) install( FILES kgpg.kcfg - DESTINATION ${KCFG_INSTALL_DIR} + DESTINATION ${KDE4_KCFG_INSTALL_DIR} ) install( FILES kgpg.desktop - DESTINATION ${AUTOSTART_INSTALL_DIR} + DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR} ) install( FILES encryptfile.desktop encryptfolder.desktop viewdecrypted.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus + DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus ) install( FILES org.kde.kgpg.Key.xml - DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} + DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/kgpg/CTestConfig.cmake b/kgpg/CTestConfig.cmake deleted file mode 100644 index e84f3ecd..00000000 --- a/kgpg/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "kgpg") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=kgpg") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/kgpg/icons/CMakeLists.txt b/kgpg/icons/CMakeLists.txt index 492d3424..bb81e613 100644 --- a/kgpg/icons/CMakeLists.txt +++ b/kgpg/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${DATA_INSTALL_DIR}/kgpg/icons ) +kde4_install_icons( ${KDE4_DATA_INSTALL_DIR}/kgpg/icons ) diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt index b4eface2..e0611e22 100644 --- a/kmix/CMakeLists.txt +++ b/kmix/CMakeLists.txt @@ -137,7 +137,7 @@ if (CANBERRA_FOUND) target_link_libraries(kmix ${CANBERRA_LIBRARIES}) endif (CANBERRA_FOUND) -install(TARGETS kmix DESTINATION ${LIB_INSTALL_DIR} ) +install(TARGETS kmix DESTINATION ${KDE4_LIB_INSTALL_DIR} ) install(TARGETS kmix ${INSTALL_TARGETS_DEFAULT_ARGS} ) @@ -177,12 +177,12 @@ if (CANBERRA_FOUND) target_link_libraries(kded_kmixd ${CANBERRA_LIBRARIES}) endif (CANBERRA_FOUND) -install(TARGETS kded_kmixd DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kded_kmixd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) #target_link_libraries( kmixd kded_kmixd ) -#install(TARGETS kmixd DESTINATION ${PLUGIN_INSTALL_DIR} ) +#install(TARGETS kmixd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install( FILES kmixd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( FILES kmixd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) ########### next target ############### @@ -223,16 +223,16 @@ endif (CANBERRA_FOUND) ########### next target ############### add_subdirectory( plasma ) -install( TARGETS kmixctrl DESTINATION ${LIB_INSTALL_DIR} ) +install( TARGETS kmixctrl DESTINATION ${KDE4_LIB_INSTALL_DIR} ) install( TARGETS kmixctrl ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( PROGRAMS kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( PROGRAMS apps/kmixremote DESTINATION ${BIN_INSTALL_DIR} ) -install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -install( FILES kmix_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix ) -install( FILES kmixctrl_restore.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES dbus/org.kde.kmix.control.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) -install( FILES dbus/org.kde.kmix.mixer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) -install( FILES dbus/org.kde.kmix.mixset.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) +install( PROGRAMS kmix.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) +install( PROGRAMS apps/kmixremote DESTINATION ${KDE4_BIN_INSTALL_DIR} ) +install( FILES restore_kmix_volumes.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install( FILES kmix_autostart.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install( FILES kmixui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmix ) +install( FILES kmixctrl_restore.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES dbus/org.kde.kmix.control.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) +install( FILES dbus/org.kde.kmix.mixer.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) +install( FILES dbus/org.kde.kmix.mixset.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kmix/pics/CMakeLists.txt b/kmix/pics/CMakeLists.txt index e66960da..d6af2e6e 100644 --- a/kmix/pics/CMakeLists.txt +++ b/kmix/pics/CMakeLists.txt @@ -23,6 +23,6 @@ install( FILES kmixdocked.png kmixdocked_mute.png kmixdocked_error.png - DESTINATION ${DATA_INSTALL_DIR}/kmix/pics ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmix/pics ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kmix/plasma/engine/CMakeLists.txt b/kmix/plasma/engine/CMakeLists.txt index 198ef2b0..c5da9c08 100644 --- a/kmix/plasma/engine/CMakeLists.txt +++ b/kmix/plasma/engine/CMakeLists.txt @@ -16,7 +16,7 @@ kde4_add_plugin(plasma_engine_mixer ${mixer_engine_SRCS}) target_link_libraries(plasma_engine_mixer ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_engine_mixer DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-engine-mixer.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_engine_mixer DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-engine-mixer.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) install(FILES mixer.operations DESTINATION - ${DATA_INSTALL_DIR}/plasma/services) + ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/kmix/profiles/CMakeLists.txt b/kmix/profiles/CMakeLists.txt index ff6d2340..82925f7e 100644 --- a/kmix/profiles/CMakeLists.txt +++ b/kmix/profiles/CMakeLists.txt @@ -4,5 +4,5 @@ install( FILES ALSA.playback.xml ALSA.capture.xml ALSA.TerraTec_DMX6Fire.1.default.xml - DESTINATION ${DATA_INSTALL_DIR}/kmix/profiles ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmix/profiles ) diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt index d0f7954d..030d61c9 100644 --- a/kompare/CMakeLists.txt +++ b/kompare/CMakeLists.txt @@ -41,16 +41,16 @@ install(TARGETS kompare ${INSTALL_TARGETS_DEFAULT_ARGS}) install( PROGRAMS kompare.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) install( FILES kompareui.rc - DESTINATION ${DATA_INSTALL_DIR}/kompare + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kompare ) install( FILES komparenavigationpart.desktop kompareviewpart.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) diff --git a/kompare/interfaces/CMakeLists.txt b/kompare/interfaces/CMakeLists.txt index bb157a6b..9823f6d0 100644 --- a/kompare/interfaces/CMakeLists.txt +++ b/kompare/interfaces/CMakeLists.txt @@ -13,6 +13,6 @@ target_link_libraries(kompareinterface ${KDE4_KDECORE_LIBS} ) set_target_properties(kompareinterface PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS kompareinterface ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES kompareinterface.h DESTINATION ${INCLUDE_INSTALL_DIR}/kompare COMPONENT Devel ) +install(FILES kompareinterface.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kompare COMPONENT Devel ) diff --git a/kompare/komparenavtreepart/CMakeLists.txt b/kompare/komparenavtreepart/CMakeLists.txt index ca99c875..7bfde14f 100644 --- a/kompare/komparenavtreepart/CMakeLists.txt +++ b/kompare/komparenavtreepart/CMakeLists.txt @@ -13,10 +13,10 @@ kde4_add_plugin(komparenavtreepart ${komparenavtreepart_PART_SRCS}) target_link_libraries(komparenavtreepart komparediff2 ${KDE4_KPARTS_LIBS} ) -install(TARGETS komparenavtreepart DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS komparenavtreepart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES komparenavtreepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES komparenavtreepart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt index d02a4925..3d9314f9 100644 --- a/kompare/komparepart/CMakeLists.txt +++ b/kompare/komparepart/CMakeLists.txt @@ -22,13 +22,13 @@ kde4_add_plugin(komparepart ${komparepart_PART_SRCS}) target_link_libraries(komparepart ${KDE4_KPARTS_LIBS} komparedialogpages komparediff2 kompareinterface ) -install(TARGETS komparepart DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS komparepart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES komparepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES komparepartui.rc DESTINATION ${DATA_INSTALL_DIR}/kompare ) +install( FILES komparepart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES komparepartui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kompare ) diff --git a/kompare/libkomparediff2/CMakeLists.txt b/kompare/libkomparediff2/CMakeLists.txt index 9a26a9d5..0c653da8 100644 --- a/kompare/libkomparediff2/CMakeLists.txt +++ b/kompare/libkomparediff2/CMakeLists.txt @@ -45,13 +45,13 @@ install(FILES marker.h kompare.h diffhunk.h - DESTINATION ${INCLUDE_INSTALL_DIR}/libkomparediff2 COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libkomparediff2 COMPONENT Devel ) # Config.cmake file. configure_file( "${PROJECT_SOURCE_DIR}/LibKompareDiff2Config.cmake.in" "${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake" @ONLY ) -set(_LibKompareDiff2_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/libkomparediff2") +set(_LibKompareDiff2_CONFIG_DEST "${KDE4_LIB_INSTALL_DIR}/cmake/libkomparediff2") install( FILES "${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake" diff --git a/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in b/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in index caa3b6a0..3f2facee 100644 --- a/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in +++ b/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in @@ -19,7 +19,7 @@ if(NOT WIN32) # This is needed on non-win32 platforms, as lib-install-dir might be in a # totally different prefix than include-install-dir. So instead hardcode the # absolute path during buildtime -set( LIBKOMPAREDIFF2_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/libkomparediff2" ) +set( LIBKOMPAREDIFF2_INCLUDE_DIR "@KDE4_INCLUDE_INSTALL_DIR@/libkomparediff2" ) else(NOT WIN32) diff --git a/kompare/pics/CMakeLists.txt b/kompare/pics/CMakeLists.txt index 512f6e8c..b894a8b6 100644 --- a/kompare/pics/CMakeLists.txt +++ b/kompare/pics/CMakeLists.txt @@ -1,5 +1,5 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt index 49007fad..fddbe8ec 100644 --- a/krdc/CMakeLists.txt +++ b/krdc/CMakeLists.txt @@ -79,16 +79,16 @@ endif() target_link_libraries(krdc ${KDE4_KDNSSD_LIBS}) install(TARGETS krdc ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES krdcui.rc DESTINATION ${DATA_INSTALL_DIR}/krdc) -install(PROGRAMS krdc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES pointcursor.png pointcursormask.png DESTINATION ${DATA_INSTALL_DIR}/krdc/pics) +install(FILES krdcui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc) +install(PROGRAMS krdc.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES pointcursor.png pointcursormask.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc/pics) if(TelepathyQt4_FOUND) configure_file(org.freedesktop.Telepathy.Client.krdc_rfb_handler.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service - DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR}) - install(FILES krdc_rfb_handler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/) + install(FILES krdc_rfb_handler.client DESTINATION ${KDE4_SHARE_INSTALL_PREFIX}/telepathy/clients/) endif() diff --git a/krdc/config/CMakeLists.txt b/krdc/config/CMakeLists.txt index 1bdba6cb..92697beb 100644 --- a/krdc/config/CMakeLists.txt +++ b/krdc/config/CMakeLists.txt @@ -1 +1 @@ -install(FILES krdc.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES krdc.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/krdc/core/CMakeLists.txt b/krdc/core/CMakeLists.txt index f5464fbc..34fee1f4 100644 --- a/krdc/core/CMakeLists.txt +++ b/krdc/core/CMakeLists.txt @@ -24,6 +24,6 @@ set(krdccore_HDRS hostpreferences.h ) -install(FILES ${krdccore_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/krdc COMPONENT Devel) -install(FILES krdc_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) -install(FILES krdc.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES ${krdccore_HDRS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/krdc COMPONENT Devel) +install(FILES krdc_plugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) +install(FILES krdc.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/krdc/konsole/CMakeLists.txt b/krdc/konsole/CMakeLists.txt index 358c63f9..a6ea0468 100644 --- a/krdc/konsole/CMakeLists.txt +++ b/krdc/konsole/CMakeLists.txt @@ -14,7 +14,7 @@ if(BUILD_KONSOLE) ${KDE4_KPARTS_LIBS} krdccore ) - install(TARGETS krdc_konsoleplugin DESTINATION ${PLUGIN_INSTALL_DIR}) + install(TARGETS krdc_konsoleplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) - install(FILES krdc_konsole.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES krdc_konsole.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endif(BUILD_KONSOLE) diff --git a/krdc/krdc_approver/CMakeLists.txt b/krdc/krdc_approver/CMakeLists.txt index 5ac2b97e..13eeca1b 100644 --- a/krdc/krdc_approver/CMakeLists.txt +++ b/krdc/krdc_approver/CMakeLists.txt @@ -12,12 +12,12 @@ target_link_libraries(krdc_rfb_approver ${KDE4_KDEUI_LIBS} ) install(TARGETS krdc_rfb_approver ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES krdc_rfb_approver.notifyrc DESTINATION ${DATA_INSTALL_DIR}/krdc_rfb_approver) +install(FILES krdc_rfb_approver.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc_rfb_approver) configure_file(org.freedesktop.Telepathy.Client.krdc_rfb_approver.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krdc_rfb_approver.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krdc_rfb_approver.service - DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR}) # FIXME any better macro for ${XDG_DATA_DIRS} ? -install(FILES krdc_rfb_approver.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/) +install(FILES krdc_rfb_approver.client DESTINATION ${KDE4_SHARE_INSTALL_PREFIX}/telepathy/clients/) diff --git a/krdc/nx/CMakeLists.txt b/krdc/nx/CMakeLists.txt index 5bbe21ca..4e3618f9 100644 --- a/krdc/nx/CMakeLists.txt +++ b/krdc/nx/CMakeLists.txt @@ -44,12 +44,12 @@ if(LIBNXCL_FOUND) add_dependencies(kcm_krdc_nxplugin krdc_nxplugin) - install(TARGETS kcm_krdc_nxplugin DESTINATION ${PLUGIN_INSTALL_DIR}) - install(TARGETS krdc_nxplugin DESTINATION ${PLUGIN_INSTALL_DIR}) + install(TARGETS kcm_krdc_nxplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) + install(TARGETS krdc_nxplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) - install(FILES krdc_nx.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - install(FILES krdc_nx_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES krdc_nx.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) + install(FILES krdc_nx_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) - install(FILES nx.protocol DESTINATION ${SERVICES_INSTALL_DIR}) - install(FILES default.dsa.key DESTINATION ${DATA_INSTALL_DIR}/krdc) + install(FILES nx.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) + install(FILES default.dsa.key DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc) endif(LIBNXCL_FOUND) diff --git a/krdc/rdp/CMakeLists.txt b/krdc/rdp/CMakeLists.txt index 0095740d..88fee135 100644 --- a/krdc/rdp/CMakeLists.txt +++ b/krdc/rdp/CMakeLists.txt @@ -38,12 +38,12 @@ if(HAVE_XFREERDP) add_dependencies(kcm_krdc_rdpplugin krdc_rdpplugin) - install(TARGETS kcm_krdc_rdpplugin DESTINATION ${PLUGIN_INSTALL_DIR}) - install(TARGETS krdc_rdpplugin DESTINATION ${PLUGIN_INSTALL_DIR}) + install(TARGETS kcm_krdc_rdpplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) + install(TARGETS krdc_rdpplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) - install(FILES krdc_rdp.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - install(FILES krdc_rdp_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES krdc_rdp.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) + install(FILES krdc_rdp_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) - install(FILES rdp.protocol DESTINATION ${SERVICES_INSTALL_DIR}) - install(FILES smb2rdc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) + install(FILES rdp.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) + install(FILES smb2rdc.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/ServiceMenus) endif(HAVE_XFREERDP) diff --git a/krdc/test/CMakeLists.txt b/krdc/test/CMakeLists.txt index 19a96f35..ddfc51f7 100644 --- a/krdc/test/CMakeLists.txt +++ b/krdc/test/CMakeLists.txt @@ -20,7 +20,7 @@ if(BUILD_TEST) ${KDE4_KDEUI_LIBS} krdccore ) - install(TARGETS krdc_testplugin DESTINATION ${PLUGIN_INSTALL_DIR}) + install(TARGETS krdc_testplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) - install(FILES krdc_test.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES krdc_test.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endif(BUILD_TEST) diff --git a/krdc/vnc/CMakeLists.txt b/krdc/vnc/CMakeLists.txt index ce0d4830..b95e1b91 100644 --- a/krdc/vnc/CMakeLists.txt +++ b/krdc/vnc/CMakeLists.txt @@ -41,11 +41,11 @@ if(LIBVNCSERVER_FOUND) add_dependencies(kcm_krdc_vncplugin krdc_vncplugin) - install(TARGETS kcm_krdc_vncplugin DESTINATION ${PLUGIN_INSTALL_DIR}) - install(TARGETS krdc_vncplugin DESTINATION ${PLUGIN_INSTALL_DIR}) + install(TARGETS kcm_krdc_vncplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) + install(TARGETS krdc_vncplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) - install(FILES krdc_vnc.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - install(FILES krdc_vnc_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES krdc_vnc.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) + install(FILES krdc_vnc_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) - install(FILES vnc.protocol DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES vnc.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) endif(LIBVNCSERVER_FOUND) diff --git a/krfb/framebuffers/qt/CMakeLists.txt b/krfb/framebuffers/qt/CMakeLists.txt index 194b405f..0f31f2f7 100644 --- a/krfb/framebuffers/qt/CMakeLists.txt +++ b/krfb/framebuffers/qt/CMakeLists.txt @@ -19,10 +19,10 @@ target_link_libraries (krfb_framebuffer_qt ) install (TARGETS krfb_framebuffer_qt - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install (FILES krfb_framebuffer_qt.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/krfb/framebuffers/x11/CMakeLists.txt b/krfb/framebuffers/x11/CMakeLists.txt index 8a46445a..7948cea8 100644 --- a/krfb/framebuffers/x11/CMakeLists.txt +++ b/krfb/framebuffers/x11/CMakeLists.txt @@ -22,10 +22,10 @@ target_link_libraries (krfb_framebuffer_x11 ) install (TARGETS krfb_framebuffer_x11 - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) install (FILES krfb_framebuffer_x11.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt index e7d4ab40..c710f5a0 100644 --- a/krfb/krfb/CMakeLists.txt +++ b/krfb/krfb/CMakeLists.txt @@ -35,7 +35,7 @@ install (TARGETS krfbprivate install (FILES krfb-framebuffer.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} + DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} ) ##################################### @@ -125,7 +125,7 @@ if(TelepathyQt4_FOUND) configure_file(org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in org.freedesktop.Telepathy.Client.krfb_rfb_handler.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service - DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) + DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR}) install(FILES krfb_rfb_handler.client DESTINATION ${CMAKE_INSTALL_PREFIX}/share/telepathy/clients/) endif() @@ -133,10 +133,10 @@ endif() ########### install files ############### install (PROGRAMS krfb.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} + DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) install (FILES krfb.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/krfb + DESTINATION ${KDE4_DATA_INSTALL_DIR}/krfb ) diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt index e0d69d4a..608e94b2 100644 --- a/ksnapshot/CMakeLists.txt +++ b/ksnapshot/CMakeLists.txt @@ -77,6 +77,6 @@ install(TARGETS kbackgroundsnapshot ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS ksnapshot.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES org.kde.ksnapshot.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) -kde4_install_icons(${ICON_INSTALL_DIR} ) +install(PROGRAMS ksnapshot.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES org.kde.ksnapshot.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR} ) diff --git a/ksystemlog/src/CMakeLists.txt b/ksystemlog/src/CMakeLists.txt index 06b494a7..64247bf1 100644 --- a/ksystemlog/src/CMakeLists.txt +++ b/ksystemlog/src/CMakeLists.txt @@ -176,5 +176,5 @@ endif() install(TARGETS ksystemlog ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS ksystemlog.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES ksystemlogui.rc DESTINATION ${DATA_INSTALL_DIR}/ksystemlog) +install(PROGRAMS ksystemlog.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES ksystemlogui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/ksystemlog) diff --git a/ktimer/CMakeLists.txt b/ktimer/CMakeLists.txt index d20cced9..7449e767 100644 --- a/ktimer/CMakeLists.txt +++ b/ktimer/CMakeLists.txt @@ -18,6 +18,6 @@ install(TARGETS ktimer ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS ktimer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( PROGRAMS ktimer.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/ktimer/CTestConfig.cmake b/ktimer/CTestConfig.cmake deleted file mode 100644 index 8774157c..00000000 --- a/ktimer/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "ktimer") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=ktimer") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/kuassel/CMakeLists.txt b/kuassel/CMakeLists.txt index d67c9935..5dc1c60d 100644 --- a/kuassel/CMakeLists.txt +++ b/kuassel/CMakeLists.txt @@ -151,7 +151,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) set(CMAKE_BUILD_WITH_INSTALL_RPATH 1) if(INDICATEQT_FOUND) - add_definitions(-DXDG_APPS_INSTALL_DIR=${XDG_APPS_INSTALL_DIR}) + add_definitions(-DXDG_APPS_INSTALL_DIR=${KDE4_XDG_APPS_INSTALL_DIR}) endif() check_function_exists(umask HAVE_UMASK) diff --git a/kuassel/data/CMakeLists.txt b/kuassel/data/CMakeLists.txt index 20d1a590..ec13f025 100644 --- a/kuassel/data/CMakeLists.txt +++ b/kuassel/data/CMakeLists.txt @@ -1,8 +1,8 @@ -install(FILES kuassel.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES kuassel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kuassel) -install(FILES kuasirc.protocol kuasircs.protocol kuasirc6.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kuassel.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES kuassel.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuassel) +install(FILES kuasirc.protocol kuasircs.protocol kuasirc6.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) -install(FILES networks.ini DESTINATION ${DATA_INSTALL_DIR}/kuassel) -install(FILES tips DESTINATION ${DATA_INSTALL_DIR}/kuassel ) -install(DIRECTORY stylesheets DESTINATION ${DATA_INSTALL_DIR}/kuassel) -install(DIRECTORY scripts DESTINATION ${DATA_INSTALL_DIR}/kuassel USE_SOURCE_PERMISSIONS) +install(FILES networks.ini DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuassel) +install(FILES tips DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuassel ) +install(DIRECTORY stylesheets DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuassel) +install(DIRECTORY scripts DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuassel USE_SOURCE_PERMISSIONS) diff --git a/kuassel/pics/CMakeLists.txt b/kuassel/pics/CMakeLists.txt index cea617b6..8dd01393 100644 --- a/kuassel/pics/CMakeLists.txt +++ b/kuassel/pics/CMakeLists.txt @@ -4,4 +4,4 @@ set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/pics.qrc PARENT_SCOPE) # install(FILES qt-logo.png # quassel-large.png -# DESTINATION ${DATA_INSTALL_DIR}/quassel/pics) +# DESTINATION ${KDE4_DATA_INSTALL_DIR}/quassel/pics) diff --git a/kuassel/src/CMakeLists.txt b/kuassel/src/CMakeLists.txt index a00d4278..7c488db7 100644 --- a/kuassel/src/CMakeLists.txt +++ b/kuassel/src/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(kuassel ${QT_QTMAIN_LIBRARY} ) -install(TARGETS kuassel RUNTIME DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS kuassel RUNTIME DESTINATION ${KDE4_BIN_INSTALL_DIR}) diff --git a/kuser/CMakeLists.txt b/kuser/CMakeLists.txt index 9812d14f..bc68541e 100644 --- a/kuser/CMakeLists.txt +++ b/kuser/CMakeLists.txt @@ -83,6 +83,6 @@ install(TARGETS kuser ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install(PROGRAMS kuser.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES kuserui.rc DESTINATION ${DATA_INSTALL_DIR}/kuser) -install(FILES kuser.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(PROGRAMS kuser.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(FILES kuserui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuser) +install(FILES kuser.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/kuser/icon/CMakeLists.txt b/kuser/icon/CMakeLists.txt index 7affd27e..9ae3f2a3 100644 --- a/kuser/icon/CMakeLists.txt +++ b/kuser/icon/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/kuser/pics/CMakeLists.txt b/kuser/pics/CMakeLists.txt index ec152183..3b069c10 100644 --- a/kuser/pics/CMakeLists.txt +++ b/kuser/pics/CMakeLists.txt @@ -1 +1 @@ -install( FILES group.png user.png DESTINATION ${DATA_INSTALL_DIR}/kuser/pics/ ) +install( FILES group.png user.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kuser/pics/ ) diff --git a/kuser/toolbar/CMakeLists.txt b/kuser/toolbar/CMakeLists.txt index d42ca32b..484b6313 100644 --- a/kuser/toolbar/CMakeLists.txt +++ b/kuser/toolbar/CMakeLists.txt @@ -1,2 +1,2 @@ -kde4_install_icons( ${DATA_INSTALL_DIR}/kuser/icons ) +kde4_install_icons( ${KDE4_DATA_INSTALL_DIR}/kuser/icons ) diff --git a/kvkbd/colors/CMakeLists.txt b/kvkbd/colors/CMakeLists.txt index 83b35e1b..dda25d78 100644 --- a/kvkbd/colors/CMakeLists.txt +++ b/kvkbd/colors/CMakeLists.txt @@ -1 +1 @@ -install( FILES dark.css legacy.css light.css simple.css DESTINATION ${DATA_INSTALL_DIR}/kvkbd/colors) +install( FILES dark.css legacy.css light.css simple.css DESTINATION ${KDE4_DATA_INSTALL_DIR}/kvkbd/colors) diff --git a/kvkbd/pics/CMakeLists.txt b/kvkbd/pics/CMakeLists.txt index ff88e778..b033a9d9 100644 --- a/kvkbd/pics/CMakeLists.txt +++ b/kvkbd/pics/CMakeLists.txt @@ -1 +1 @@ -install( FILES tray.png DESTINATION ${DATA_INSTALL_DIR}/kvkbd/pics) +install( FILES tray.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kvkbd/pics) diff --git a/kvkbd/src/CMakeLists.txt b/kvkbd/src/CMakeLists.txt index 2400ff4c..d8bff516 100644 --- a/kvkbd/src/CMakeLists.txt +++ b/kvkbd/src/CMakeLists.txt @@ -36,4 +36,4 @@ target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARI install(TARGETS kvkbd ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( FILES kvkbd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kvkbd.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/kvkbd/themes/CMakeLists.txt b/kvkbd/themes/CMakeLists.txt index 25319667..ba700d51 100644 --- a/kvkbd/themes/CMakeLists.txt +++ b/kvkbd/themes/CMakeLists.txt @@ -1 +1 @@ -install( FILES standart.xml DESTINATION ${DATA_INSTALL_DIR}/kvkbd/themes) +install( FILES standart.xml DESTINATION ${KDE4_DATA_INSTALL_DIR}/kvkbd/themes) diff --git a/libksane/cmake/templates/libksane.pc.cmake.in b/libksane/cmake/templates/libksane.pc.cmake.in index 8e2dbaaa..c238c656 100644 --- a/libksane/cmake/templates/libksane.pc.cmake.in +++ b/libksane/cmake/templates/libksane.pc.cmake.in @@ -1,12 +1,12 @@ prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${BIN_INSTALL_DIR} -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR} +exec_prefix=${KDE4_BIN_INSTALL_DIR} +libdir=${KDE4_LIB_INSTALL_DIR} +includedir=${KDE4_INCLUDE_INSTALL_DIR} Name: libksane Description: libksane is a C++ library for SANE interface to control flat scanners. URL: http://www.digikam.org Requires: Version: ${KSANE_LIB_VERSION_STRING} -Libs: -L${LIB_INSTALL_DIR} -lksane -Cflags: -I${INCLUDE_INSTALL_DIR} +Libs: -L${KDE4_LIB_INSTALL_DIR} -lksane +Cflags: -I${KDE4_INCLUDE_INSTALL_DIR} diff --git a/libksane/ksaneplugin/CMakeLists.txt b/libksane/ksaneplugin/CMakeLists.txt index a853f2ea..0592f08e 100644 --- a/libksane/ksaneplugin/CMakeLists.txt +++ b/libksane/ksaneplugin/CMakeLists.txt @@ -16,8 +16,8 @@ kde4_add_plugin(ksaneplugin sanedialog.cpp) target_link_libraries(ksaneplugin ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ksane) -install(TARGETS ksaneplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS ksaneplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES ksane_scan_service.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES ksane_scan_service.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/libksane/libksane/CMakeLists.txt b/libksane/libksane/CMakeLists.txt index 1b8e591b..6ef8282f 100644 --- a/libksane/libksane/CMakeLists.txt +++ b/libksane/libksane/CMakeLists.txt @@ -66,7 +66,7 @@ INSTALL( ksane.h libksane_export.h ${CMAKE_CURRENT_BINARY_DIR}/version.h - DESTINATION ${INCLUDE_INSTALL_DIR}/libksane + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libksane COMPONENT Devel ) @@ -76,7 +76,7 @@ CONFIGURE_FILE( ) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc - DESTINATION ${LIB_INSTALL_DIR}/pkgconfig + DESTINATION ${KDE4_LIB_INSTALL_DIR}/pkgconfig ) # Install find cmake script to the system for client applications. @@ -84,8 +84,8 @@ INSTALL( INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake - DESTINATION ${LIB_INSTALL_DIR}/cmake/KSane + DESTINATION ${KDE4_LIB_INSTALL_DIR}/cmake/KSane ) -KDE4_INSTALL_ICONS(${ICON_INSTALL_DIR}) +KDE4_INSTALL_ICONS(${KDE4_ICON_INSTALL_DIR}) diff --git a/libktorrent/cmake/modules/CMakeLists.txt b/libktorrent/cmake/modules/CMakeLists.txt index c7166b2e..b135b139 100644 --- a/libktorrent/cmake/modules/CMakeLists.txt +++ b/libktorrent/cmake/modules/CMakeLists.txt @@ -1,3 +1,3 @@ -set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules ) +set(module_install_dir ${KDE4_DATA_INSTALL_DIR}/cmake/modules ) install(FILES FindKTorrent.cmake DESTINATION ${module_install_dir}) diff --git a/libktorrent/cmake/modules/FindKTorrent.cmake b/libktorrent/cmake/modules/FindKTorrent.cmake index 4cea6401..a2249e44 100644 --- a/libktorrent/cmake/modules/FindKTorrent.cmake +++ b/libktorrent/cmake/modules/FindKTorrent.cmake @@ -23,7 +23,7 @@ else(LIBKTORRENT_INCLUDE_DIR AND LIBKTORRENT_LIBRARIES) ktorrent_export.h PATHS ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_INSTALL_DIR} PATH_SUFFIXES libktorrent ) @@ -33,7 +33,7 @@ else(LIBKTORRENT_INCLUDE_DIR AND LIBKTORRENT_LIBRARIES) ktorrent PATHS ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} + ${KDE4_LIB_INSTALL_DIR} ) if(LIBKTORRENT_INCLUDE_DIR AND LIBKTORRENT_LIBRARIES) set(LIBKTORRENT_FOUND TRUE) @@ -45,7 +45,7 @@ else(LIBKTORRENT_INCLUDE_DIR AND LIBKTORRENT_LIBRARIES) ktorrentd PATHS ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} + ${KDE4_LIB_INSTALL_DIR} ) if(NOT LIBKTORRENT_LIBRARIES_DEBUG) set(LIBKTORRENT_FOUND FALSE) diff --git a/libktorrent/scripts/gen_pkg.rb b/libktorrent/scripts/gen_pkg.rb index eb9bcd8c..98c20a6e 100755 --- a/libktorrent/scripts/gen_pkg.rb +++ b/libktorrent/scripts/gen_pkg.rb @@ -95,7 +95,7 @@ for lang in i18nlangs Dir.mkdir( dest ) makefile = File.new( "#{dest}/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC ) makefile << "file(GLOB _po_files *.po)\n" - makefile << "GETTEXT_PROCESS_PO_FILES( #{lang} ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )\n" + makefile << "GETTEXT_PROCESS_PO_FILES( #{lang} ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} )\n" makefile.close() topmakefile << "add_subdirectory( #{lang} )\n" end diff --git a/libktorrent/src/CMakeLists.txt b/libktorrent/src/CMakeLists.txt index 1168b2aa..8fec54e7 100644 --- a/libktorrent/src/CMakeLists.txt +++ b/libktorrent/src/CMakeLists.txt @@ -265,10 +265,10 @@ set (migrate_HDR -install(FILES ${bcodec_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/bcodec COMPONENT Devel) -install(FILES ${interfaces_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/interfaces COMPONENT Devel) -install(FILES ${migrate_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/migrate COMPONENT Devel) -install(FILES ${ktorrent_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent COMPONENT Devel) +install(FILES ${bcodec_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/bcodec COMPONENT Devel) +install(FILES ${interfaces_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/interfaces COMPONENT Devel) +install(FILES ${migrate_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/migrate COMPONENT Devel) +install(FILES ${ktorrent_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent COMPONENT Devel) add_subdirectory(torrent) add_subdirectory(datachecker) diff --git a/libktorrent/src/datachecker/CMakeLists.txt b/libktorrent/src/datachecker/CMakeLists.txt index d0aa6c07..23d3deed 100644 --- a/libktorrent/src/datachecker/CMakeLists.txt +++ b/libktorrent/src/datachecker/CMakeLists.txt @@ -11,6 +11,6 @@ set (datachecker_HDR ) install(FILES ${datachecker_HDR} - DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/datachecker + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/datachecker COMPONENT Devel ) \ No newline at end of file diff --git a/libktorrent/src/dht/CMakeLists.txt b/libktorrent/src/dht/CMakeLists.txt index 320e7567..7f0d1c88 100644 --- a/libktorrent/src/dht/CMakeLists.txt +++ b/libktorrent/src/dht/CMakeLists.txt @@ -29,7 +29,7 @@ set (dht_HDR rpcmsgfactory.h ) -install(FILES ${dht_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/dht COMPONENT Devel) +install(FILES ${dht_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/dht COMPONENT Devel) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/libktorrent/src/diskio/CMakeLists.txt b/libktorrent/src/diskio/CMakeLists.txt index e3cb9ad9..665d9bfb 100644 --- a/libktorrent/src/diskio/CMakeLists.txt +++ b/libktorrent/src/diskio/CMakeLists.txt @@ -17,4 +17,4 @@ set (diskio_HDR piecedata.h ) -install(FILES ${diskio_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/diskio COMPONENT Devel) \ No newline at end of file +install(FILES ${diskio_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/diskio COMPONENT Devel) \ No newline at end of file diff --git a/libktorrent/src/download/CMakeLists.txt b/libktorrent/src/download/CMakeLists.txt index 7b687b81..8d07a86a 100644 --- a/libktorrent/src/download/CMakeLists.txt +++ b/libktorrent/src/download/CMakeLists.txt @@ -13,6 +13,6 @@ set (download_HDR ) install(FILES ${download_HDR} - DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/download + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/download COMPONENT Devel ) \ No newline at end of file diff --git a/libktorrent/src/magnet/CMakeLists.txt b/libktorrent/src/magnet/CMakeLists.txt index d9c3c0f2..23d4ebe7 100644 --- a/libktorrent/src/magnet/CMakeLists.txt +++ b/libktorrent/src/magnet/CMakeLists.txt @@ -8,4 +8,4 @@ set (magnet_HDR metadatadownload.h ) -install(FILES ${magnet_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/magnet COMPONENT Devel) +install(FILES ${magnet_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/magnet COMPONENT Devel) diff --git a/libktorrent/src/mse/CMakeLists.txt b/libktorrent/src/mse/CMakeLists.txt index 1b2a3225..24d5f756 100644 --- a/libktorrent/src/mse/CMakeLists.txt +++ b/libktorrent/src/mse/CMakeLists.txt @@ -11,4 +11,4 @@ set (mse_HDR encryptedpacketsocket.h ) -install(FILES ${mse_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/mse COMPONENT Devel) \ No newline at end of file +install(FILES ${mse_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/mse COMPONENT Devel) \ No newline at end of file diff --git a/libktorrent/src/net/CMakeLists.txt b/libktorrent/src/net/CMakeLists.txt index 655ce6a4..39dbd80e 100644 --- a/libktorrent/src/net/CMakeLists.txt +++ b/libktorrent/src/net/CMakeLists.txt @@ -24,5 +24,5 @@ set(net_HDR serversocket.h ) -install(FILES ${net_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/net COMPONENT Devel) +install(FILES ${net_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/net COMPONENT Devel) diff --git a/libktorrent/src/peer/CMakeLists.txt b/libktorrent/src/peer/CMakeLists.txt index 175b8eec..bf641aba 100644 --- a/libktorrent/src/peer/CMakeLists.txt +++ b/libktorrent/src/peer/CMakeLists.txt @@ -20,7 +20,7 @@ set (peer_HDR ) -install(FILES ${peer_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/peer COMPONENT Devel) +install(FILES ${peer_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/peer COMPONENT Devel) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/libktorrent/src/torrent/CMakeLists.txt b/libktorrent/src/torrent/CMakeLists.txt index 277f4213..01332126 100644 --- a/libktorrent/src/torrent/CMakeLists.txt +++ b/libktorrent/src/torrent/CMakeLists.txt @@ -17,7 +17,7 @@ set(torrent_HDR torrentfilestream.h ) -install(FILES ${torrent_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/torrent COMPONENT Devel) +install(FILES ${torrent_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/torrent COMPONENT Devel) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/libktorrent/src/tracker/CMakeLists.txt b/libktorrent/src/tracker/CMakeLists.txt index 7dcc8dd9..7d8c6838 100644 --- a/libktorrent/src/tracker/CMakeLists.txt +++ b/libktorrent/src/tracker/CMakeLists.txt @@ -9,4 +9,4 @@ set (tracker_HDR ./kioannouncejob.h ) -install(FILES ${tracker_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/tracker COMPONENT Devel) +install(FILES ${tracker_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/tracker COMPONENT Devel) diff --git a/libktorrent/src/upnp/CMakeLists.txt b/libktorrent/src/upnp/CMakeLists.txt index 4cd214ec..3d9acdfa 100644 --- a/libktorrent/src/upnp/CMakeLists.txt +++ b/libktorrent/src/upnp/CMakeLists.txt @@ -4,4 +4,4 @@ set (upnp_HDR upnpmcastsocket.h ) -install(FILES ${upnp_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/upnp COMPONENT Devel) \ No newline at end of file +install(FILES ${upnp_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/upnp COMPONENT Devel) \ No newline at end of file diff --git a/libktorrent/src/util/CMakeLists.txt b/libktorrent/src/util/CMakeLists.txt index 78fa0d48..96613e7d 100644 --- a/libktorrent/src/util/CMakeLists.txt +++ b/libktorrent/src/util/CMakeLists.txt @@ -32,4 +32,4 @@ set (util_HDR ${util_HDR} signalcatcher.h ) -install(FILES ${util_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/util COMPONENT Devel) +install(FILES ${util_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/util COMPONENT Devel) diff --git a/libktorrent/src/utp/CMakeLists.txt b/libktorrent/src/utp/CMakeLists.txt index a7a26920..05f43328 100644 --- a/libktorrent/src/utp/CMakeLists.txt +++ b/libktorrent/src/utp/CMakeLists.txt @@ -16,4 +16,4 @@ set(utp_HDR packetbuffer.h ) -install(FILES ${utp_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/utp COMPONENT Devel) +install(FILES ${utp_HDR} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libktorrent/utp COMPONENT Devel) diff --git a/lokalize/icons/CMakeLists.txt b/lokalize/icons/CMakeLists.txt index c58252b4..8b13782d 100644 --- a/lokalize/icons/CMakeLists.txt +++ b/lokalize/icons/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(global) -kde4_install_icons(${DATA_INSTALL_DIR}/lokalize/icons) +kde4_install_icons(${KDE4_DATA_INSTALL_DIR}/lokalize/icons) diff --git a/lokalize/icons/global/CMakeLists.txt b/lokalize/icons/global/CMakeLists.txt index 02e3c9ec..64266d49 100644 --- a/lokalize/icons/global/CMakeLists.txt +++ b/lokalize/icons/global/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons(${ICON_INSTALL_DIR}) +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/lokalize/scripts/CMakeLists.txt b/lokalize/scripts/CMakeLists.txt index ae8ca8b2..38109cb8 100644 --- a/lokalize/scripts/CMakeLists.txt +++ b/lokalize/scripts/CMakeLists.txt @@ -5,25 +5,25 @@ IF (WIN32) newprojectwizard_win.rc newprojectwizard_win.py newprojectwizard.py - DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/lokalize/scripts ) ELSE (WIN32) install( FILES newprojectwizard.rc newprojectwizard.py - DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/lokalize/scripts ) install( PROGRAMS find-gui-text.sh - DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/lokalize/scripts ) ENDIF (WIN32) install( FILES msgmerge.py msgmerge.rc - DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/lokalize/scripts ) install( FILES xliff2odf.py xliff2odf.rc xliff2odf-standalone.py xliffmerge.py - DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts/odf ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/lokalize/scripts/odf ) diff --git a/lokalize/src/CMakeLists.txt b/lokalize/src/CMakeLists.txt index af796af6..8570e2b5 100644 --- a/lokalize/src/CMakeLists.txt +++ b/lokalize/src/CMakeLists.txt @@ -171,8 +171,8 @@ install(TARGETS lokalize ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS lokalize.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES lokalize.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) +install( PROGRAMS lokalize.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) +install( FILES lokalize.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR} ) install( FILES editorui.rc lokalizemainwindowui.rc @@ -181,4 +181,4 @@ install( FILES tm/translationmemoryrui.rc filesearch/filesearchtabui.rc lokalize.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/lokalize ) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/lokalize ) diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt index c0da7d63..557e6894 100644 --- a/okular/CMakeLists.txt +++ b/okular/CMakeLists.txt @@ -83,7 +83,7 @@ install( FILES core/fileprinter.h core/observer.h ${CMAKE_CURRENT_BINARY_DIR}/settings_core.h - DESTINATION ${INCLUDE_INSTALL_DIR}/okular/core COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/okular/core COMPONENT Devel) install( FILES interfaces/configinterface.h @@ -91,7 +91,7 @@ install( FILES interfaces/printinterface.h interfaces/saveinterface.h interfaces/viewerinterface.h - DESTINATION ${INCLUDE_INSTALL_DIR}/okular/interfaces COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/okular/interfaces COMPONENT Devel) kde4_add_kcfg_files(okularcore_SRCS ${PROJECT_SOURCE_DIR}/conf/settings_core.kcfgc ) @@ -107,9 +107,9 @@ set_target_properties(okularcore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVER install(TARGETS okularcore ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES conf/okular.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(FILES conf/okular_core.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(FILES core/okularGenerator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES conf/okular.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) +install(FILES conf/okular_core.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) +install(FILES core/okularGenerator.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) # okularpart @@ -178,13 +178,13 @@ kde4_add_plugin(okularpart SHARED ${okularpart_SRCS}) target_link_libraries(okularpart okularcore ${KDE4_KPARTS_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${MATH_LIB} ${KDE4_SOLID_LIBRARY}) -install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES okular_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES part.rc part-viewermode.rc DESTINATION ${DATA_INSTALL_DIR}/okular ) +install( FILES okular_part.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( FILES part.rc part-viewermode.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular ) ########### cmake files ################# @@ -192,5 +192,5 @@ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVer install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OkularConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake - DESTINATION ${LIB_INSTALL_DIR}/cmake/Okular ) + DESTINATION ${KDE4_LIB_INSTALL_DIR}/cmake/Okular ) diff --git a/okular/generators/comicbook/CMakeLists.txt b/okular/generators/comicbook/CMakeLists.txt index 67ed4b0c..c7033646 100644 --- a/okular/generators/comicbook/CMakeLists.txt +++ b/okular/generators/comicbook/CMakeLists.txt @@ -20,11 +20,11 @@ if (UNIX) target_link_libraries(okularGenerator_comicbook ${KDE4_KPTY_LIBRARY}) endif (UNIX) -install(TARGETS okularGenerator_comicbook DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_comicbook DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_comicbook.desktop okularComicbook.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_comicbook.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_comicbook.desktop okularComicbook.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_comicbook.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/djvu/CMakeLists.txt b/okular/generators/djvu/CMakeLists.txt index ee3a1a49..d07fa383 100644 --- a/okular/generators/djvu/CMakeLists.txt +++ b/okular/generators/djvu/CMakeLists.txt @@ -17,12 +17,12 @@ kde4_add_plugin(okularGenerator_djvu ${okularGenerator_djvu_SRCS}) target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_djvu DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_djvu DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_djvu.desktop okularDjvu.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_djvu.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_djvu.desktop okularDjvu.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_djvu.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/dvi/CMakeLists.txt b/okular/generators/dvi/CMakeLists.txt index daab1d88..a799e357 100644 --- a/okular/generators/dvi/CMakeLists.txt +++ b/okular/generators/dvi/CMakeLists.txt @@ -53,11 +53,11 @@ if (FREETYPE_FOUND) target_link_libraries(okularGenerator_dvi ${FREETYPE_LIBRARIES}) endif (FREETYPE_FOUND) -install(TARGETS okularGenerator_dvi DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_dvi DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_dvi.desktop okularDvi.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_dvi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_dvi.desktop okularDvi.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_dvi.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/epub/CMakeLists.txt b/okular/generators/epub/CMakeLists.txt index b615d2f5..d6eba923 100644 --- a/okular/generators/epub/CMakeLists.txt +++ b/okular/generators/epub/CMakeLists.txt @@ -18,10 +18,10 @@ kde4_add_plugin(okularGenerator_epub ${okularGenerator_epub_PART_SRCS}) target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_epub DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_epub DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_epub.desktop okularEPub.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_epub.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_epub.desktop okularEPub.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_epub.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/epub/data/CMakeLists.txt b/okular/generators/epub/data/CMakeLists.txt index c6af2091..ed1d2a56 100644 --- a/okular/generators/epub/data/CMakeLists.txt +++ b/okular/generators/epub/data/CMakeLists.txt @@ -2,4 +2,4 @@ install(FILES okular-epub-sound-icon.png okular-epub-movie.png - DESTINATION ${DATA_INSTALL_DIR}/okular/pics) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular/pics) diff --git a/okular/generators/fax/CMakeLists.txt b/okular/generators/fax/CMakeLists.txt index 79e7faa8..3fec8e6d 100644 --- a/okular/generators/fax/CMakeLists.txt +++ b/okular/generators/fax/CMakeLists.txt @@ -11,10 +11,10 @@ kde4_add_plugin(okularGenerator_fax ${okularGenerator_fax_PART_SRCS}) target_link_libraries(okularGenerator_fax okularcore ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_fax DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_fax DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_fax.desktop okularFax.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_fax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_fax.desktop okularFax.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_fax.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/fictionbook/CMakeLists.txt b/okular/generators/fictionbook/CMakeLists.txt index 2b5b4d77..c0161139 100644 --- a/okular/generators/fictionbook/CMakeLists.txt +++ b/okular/generators/fictionbook/CMakeLists.txt @@ -17,12 +17,12 @@ kde4_add_plugin(okularGenerator_fb ${okularGenerator_fb_PART_SRCS}) target_link_libraries(okularGenerator_fb okularcore ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_fb DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_fb DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_fb.desktop okularFb.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_fb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_fb.desktop okularFb.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_fb.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -kde4_install_icons(${DATA_INSTALL_DIR}/okular/icons) +kde4_install_icons(${KDE4_DATA_INSTALL_DIR}/okular/icons) diff --git a/okular/generators/kimgio/CMakeLists.txt b/okular/generators/kimgio/CMakeLists.txt index bfb24956..8d5f79d0 100644 --- a/okular/generators/kimgio/CMakeLists.txt +++ b/okular/generators/kimgio/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(okularGenerator_kimgio ${KDE4_KEXIV2_LIBS} ${QT_QTXML_LIBRARY} ) -install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_kimgio DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) if(ENABLE_TESTING) set( kimgiotest_SRCS tests/kimgiotest.cpp @@ -39,7 +39,7 @@ endif() ########### install files ############### -install( FILES libokularGenerator_kimgio.desktop okularKimgio.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_kimgio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_kimgio.desktop okularKimgio.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_kimgio.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -#install( FILES gui.rc DESTINATION ${DATA_INSTALL_DIR}/okular_kimgio ) +#install( FILES gui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular_kimgio ) diff --git a/okular/generators/mobipocket/CMakeLists.txt b/okular/generators/mobipocket/CMakeLists.txt index 910623b6..951380d4 100644 --- a/okular/generators/mobipocket/CMakeLists.txt +++ b/okular/generators/mobipocket/CMakeLists.txt @@ -12,9 +12,9 @@ kde4_add_plugin(okularGenerator_mobi ${okularGenerator_mobi_PART_SRCS}) target_link_libraries(okularGenerator_mobi okularcore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QMOBIPOCKET_LIBRARIES}) -install(TARGETS okularGenerator_mobi DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_mobi DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_mobi.desktop okularMobi.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_mobi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_mobi.desktop okularMobi.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_mobi.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/ooo/CMakeLists.txt b/okular/generators/ooo/CMakeLists.txt index 2496fbb9..f2587dfa 100644 --- a/okular/generators/ooo/CMakeLists.txt +++ b/okular/generators/ooo/CMakeLists.txt @@ -31,11 +31,11 @@ if (QCA2_FOUND) target_link_libraries(okularGenerator_ooo okularcore ${QCA2_LIBRARIES}) endif (QCA2_FOUND) -install(TARGETS okularGenerator_ooo DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_ooo DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_ooo.desktop okularOoo.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_ooo.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_ooo.desktop okularOoo.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_ooo.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/plucker/CMakeLists.txt b/okular/generators/plucker/CMakeLists.txt index c79d59a7..ba65f3c5 100644 --- a/okular/generators/plucker/CMakeLists.txt +++ b/okular/generators/plucker/CMakeLists.txt @@ -25,11 +25,11 @@ kde4_add_plugin(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunplu target_link_libraries(okularGenerator_plucker okularcore ${KDE4_KIO_LIBS} ${MATH_LIB} ${JPEG_LIBRARY} ${ZLIB_LIBRARY}) -install(TARGETS okularGenerator_plucker DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_plucker DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_plucker.desktop okularPlucker.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_plucker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_plucker.desktop okularPlucker.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_plucker.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/poppler/CMakeLists.txt b/okular/generators/poppler/CMakeLists.txt index fa0b3abd..e6511c04 100644 --- a/okular/generators/poppler/CMakeLists.txt +++ b/okular/generators/poppler/CMakeLists.txt @@ -37,11 +37,11 @@ kde4_add_plugin(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS}) target_link_libraries(okularGenerator_poppler ${POPPLER_QT4_LIBRARIES} okularcore ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARIES}) -install(TARGETS okularGenerator_poppler DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_poppler DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_poppler.desktop okularPoppler.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_pdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_poppler.desktop okularPoppler.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_pdf.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/poppler/conf/CMakeLists.txt b/okular/generators/poppler/conf/CMakeLists.txt index 844e3fd2..c3a1554f 100644 --- a/okular/generators/poppler/conf/CMakeLists.txt +++ b/okular/generators/poppler/conf/CMakeLists.txt @@ -1,3 +1,3 @@ -install(FILES pdfsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES pdfsettings.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/okular/generators/spectre/CMakeLists.txt b/okular/generators/spectre/CMakeLists.txt index a53fbb90..af2296c1 100644 --- a/okular/generators/spectre/CMakeLists.txt +++ b/okular/generators/spectre/CMakeLists.txt @@ -21,12 +21,12 @@ kde4_add_plugin(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS}) target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_ghostview DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_ghostview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_ghostview.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -kde4_install_icons(${DATA_INSTALL_DIR}/okular/icons) +kde4_install_icons(${KDE4_DATA_INSTALL_DIR}/okular/icons) diff --git a/okular/generators/spectre/conf/CMakeLists.txt b/okular/generators/spectre/conf/CMakeLists.txt index 63364e7f..5a6b8a73 100644 --- a/okular/generators/spectre/conf/CMakeLists.txt +++ b/okular/generators/spectre/conf/CMakeLists.txt @@ -1,3 +1,3 @@ -install(FILES gssettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES gssettings.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/okular/generators/tiff/CMakeLists.txt b/okular/generators/tiff/CMakeLists.txt index 31186eaf..07dd9686 100644 --- a/okular/generators/tiff/CMakeLists.txt +++ b/okular/generators/tiff/CMakeLists.txt @@ -15,11 +15,11 @@ kde4_add_plugin(okularGenerator_tiff ${okularGenerator_tiff_SRCS}) target_link_libraries(okularGenerator_tiff okularcore ${TIFF_LIBRARIES} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_tiff DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_tiff DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_tiff.desktop okularTiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_tiff.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_tiff.desktop okularTiff.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_tiff.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/txt/CMakeLists.txt b/okular/generators/txt/CMakeLists.txt index 9229868a..8e914d1a 100644 --- a/okular/generators/txt/CMakeLists.txt +++ b/okular/generators/txt/CMakeLists.txt @@ -16,10 +16,10 @@ kde4_add_plugin(okularGenerator_txt ${okularGenerator_txt_SRCS}) target_link_libraries(okularGenerator_txt okularcore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) -install(TARGETS okularGenerator_txt DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_txt DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_txt.desktop okularTxt.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_txt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_txt.desktop okularTxt.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_txt.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/generators/xps/CMakeLists.txt b/okular/generators/xps/CMakeLists.txt index 0a7e0a7c..5f65b012 100644 --- a/okular/generators/xps/CMakeLists.txt +++ b/okular/generators/xps/CMakeLists.txt @@ -14,11 +14,11 @@ kde4_add_plugin(okularGenerator_xps ${okularGenerator_xps_SRCS}) target_link_libraries(okularGenerator_xps okularcore ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS okularGenerator_xps DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS okularGenerator_xps DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES libokularGenerator_xps.desktop okularXps.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( PROGRAMS okularApplication_xps.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES libokularGenerator_xps.desktop okularXps.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( PROGRAMS okularApplication_xps.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/okular/plasma/components/CMakeLists.txt b/okular/plasma/components/CMakeLists.txt index c7f53bb5..058acda1 100644 --- a/okular/plasma/components/CMakeLists.txt +++ b/okular/plasma/components/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(okularplugin okularcore ) -install(TARGETS okularplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/okular) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/okular) +install(TARGETS okularplugin DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/okular) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/okular) #add_subdirectory(test) diff --git a/okular/shell/CMakeLists.txt b/okular/shell/CMakeLists.txt index 4751e01b..c95083ec 100644 --- a/okular/shell/CMakeLists.txt +++ b/okular/shell/CMakeLists.txt @@ -21,6 +21,6 @@ install(TARGETS okular ${INSTALL_TARGETS_DEFAULT_ARGS}) # okular shell data files -install( PROGRAMS okular.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/okular ) +install( PROGRAMS okular.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) +install( FILES shell.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular ) diff --git a/okular/ui/data/CMakeLists.txt b/okular/ui/data/CMakeLists.txt index 491b9935..6961dd11 100644 --- a/okular/ui/data/CMakeLists.txt +++ b/okular/ui/data/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory(icons) # install annotator xml tools description install(FILES tools.xml - DESTINATION ${DATA_INSTALL_DIR}/okular) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular) # install annotation tool images install(FILES @@ -15,7 +15,7 @@ install(FILES tool-note-okular-colorizable.png tool-note-inline.png tool-note-inline-okular-colorizable.png - DESTINATION ${DATA_INSTALL_DIR}/okular/pics) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular/pics) # install annotation page images install(FILES checkmark.png @@ -35,17 +35,17 @@ install(FILES star.png uparrow.png upleftarrow.png - DESTINATION ${DATA_INSTALL_DIR}/okular/pics) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular/pics) # install annotation stamps install(FILES stamps.svg - DESTINATION ${DATA_INSTALL_DIR}/okular/pics) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular/pics) # install misc images # newstuff if (FALSE) install(FILES okular.knsrc - DESTINATION ${CONFIG_INSTALL_DIR}) + DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) endif (FALSE) diff --git a/okular/ui/data/icons/CMakeLists.txt b/okular/ui/data/icons/CMakeLists.txt index 106884f4..248f55f5 100644 --- a/okular/ui/data/icons/CMakeLists.txt +++ b/okular/ui/data/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/partitionmanager/src/CMakeLists.txt b/partitionmanager/src/CMakeLists.txt index 9be25aa3..0414343a 100644 --- a/partitionmanager/src/CMakeLists.txt +++ b/partitionmanager/src/CMakeLists.txt @@ -71,8 +71,8 @@ target_link_libraries(partitionmanager partitionmanagerprivate ${KDE4_KDECORE_LI install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/partitionmanager.appdata.xml DESTINATION share/appdata) -install(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager) -install(PROGRAMS partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES gui/partitionmanagerui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/partitionmanager) +install(PROGRAMS partitionmanager.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) ############################################ diff --git a/partitionmanager/src/plugins/CMakeLists.txt b/partitionmanager/src/plugins/CMakeLists.txt index 2c80e89e..7c0a0020 100644 --- a/partitionmanager/src/plugins/CMakeLists.txt +++ b/partitionmanager/src/plugins/CMakeLists.txt @@ -17,7 +17,7 @@ ############################################ -install(FILES pmcorebackendplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES pmcorebackendplugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}) option(PARTMAN_LIBPARTEDBACKEND "Build the libparted backend plugin." ON) diff --git a/partitionmanager/src/plugins/dummy/CMakeLists.txt b/partitionmanager/src/plugins/dummy/CMakeLists.txt index b58b25b3..e097cc77 100644 --- a/partitionmanager/src/plugins/dummy/CMakeLists.txt +++ b/partitionmanager/src/plugins/dummy/CMakeLists.txt @@ -21,6 +21,6 @@ kde4_add_plugin(pmdummybackendplugin ${pmdummybackendplugin_SRCS}) target_link_libraries(pmdummybackendplugin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS}) -install(TARGETS pmdummybackendplugin DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES pmdummybackendplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS pmdummybackendplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES pmdummybackendplugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/partitionmanager/src/plugins/libparted/CMakeLists.txt b/partitionmanager/src/plugins/libparted/CMakeLists.txt index 39b93fb1..e2653591 100644 --- a/partitionmanager/src/plugins/libparted/CMakeLists.txt +++ b/partitionmanager/src/plugins/libparted/CMakeLists.txt @@ -33,5 +33,5 @@ kde4_add_plugin(pmlibpartedbackendplugin ${pmlibpartedbackendplugin_SRCS}) target_link_libraries(pmlibpartedbackendplugin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS}) -install(TARGETS pmlibpartedbackendplugin DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES pmlibpartedbackendplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS pmlibpartedbackendplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES pmlibpartedbackendplugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/print-manager/add-printer/CMakeLists.txt b/print-manager/add-printer/CMakeLists.txt index 0764bc24..b1d2c5c6 100644 --- a/print-manager/add-printer/CMakeLists.txt +++ b/print-manager/add-printer/CMakeLists.txt @@ -37,4 +37,4 @@ target_link_libraries(kde-add-printer kcupslib ) -install(TARGETS kde-add-printer DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS kde-add-printer DESTINATION ${KDE4_BIN_INSTALL_DIR}) diff --git a/print-manager/configure-printer/CMakeLists.txt b/print-manager/configure-printer/CMakeLists.txt index 14394d40..bf4d4540 100644 --- a/print-manager/configure-printer/CMakeLists.txt +++ b/print-manager/configure-printer/CMakeLists.txt @@ -25,7 +25,7 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ConfigurePrinter.service - DESTINATION ${DBUS_SERVICES_INSTALL_DIR} + DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR} ) add_executable(configure-printer ${configureprinter_SRCS}) @@ -36,4 +36,4 @@ target_link_libraries(configure-printer kcupslib ) -install(TARGETS configure-printer DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS configure-printer DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/print-manager/configure-printer/org.kde.ConfigurePrinter.service.in b/print-manager/configure-printer/org.kde.ConfigurePrinter.service.in index 55f75258..261d8cfc 100644 --- a/print-manager/configure-printer/org.kde.ConfigurePrinter.service.in +++ b/print-manager/configure-printer/org.kde.ConfigurePrinter.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.kde.ConfigurePrinter -Exec=@LIBEXEC_INSTALL_DIR@/configure-printer +Exec=@KDE4_LIBEXEC_INSTALL_DIR@/configure-printer diff --git a/print-manager/declarative-plugins/CMakeLists.txt b/print-manager/declarative-plugins/CMakeLists.txt index b419d02c..a5f4850a 100644 --- a/print-manager/declarative-plugins/CMakeLists.txt +++ b/print-manager/declarative-plugins/CMakeLists.txt @@ -9,5 +9,5 @@ target_link_libraries(printmanager kcupslib ) -install(TARGETS printmanager DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/printmanager) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/printmanager) +install(TARGETS printmanager DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/printmanager) +install(FILES qmldir DESTINATION ${KDE4_IMPORTS_INSTALL_DIR}/org/kde/printmanager) diff --git a/print-manager/plasmoid/CMakeLists.txt b/print-manager/plasmoid/CMakeLists.txt index 7af09b3c..71b1c3cd 100644 --- a/print-manager/plasmoid/CMakeLists.txt +++ b/print-manager/plasmoid/CMakeLists.txt @@ -9,8 +9,8 @@ target_link_libraries(printmanagerwidget kcupslib ) -install(TARGETS printmanagerwidget DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer) +install(TARGETS printmanagerwidget DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/plugins/designer) # QML Stuff -install(FILES package/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-printmanager.desktop) -install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.printmanager) +install(FILES package/metadata.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} RENAME plasma-applet-printmanager.desktop) +install(DIRECTORY package/ DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.printmanager) diff --git a/print-manager/print-manager-kded/CMakeLists.txt b/print-manager/print-manager-kded/CMakeLists.txt index b8666b69..efc0c934 100644 --- a/print-manager/print-manager-kded/CMakeLists.txt +++ b/print-manager/print-manager-kded/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(kded_printmanager kcupslib ) -install(TARGETS kded_printmanager DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES printmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) -install(FILES printmanager.notifyrc DESTINATION ${DATA_INSTALL_DIR}/printmanager) +install(TARGETS kded_printmanager DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES printmanager.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) +install(FILES printmanager.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/printmanager) diff --git a/print-manager/printer-manager-kcm/CMakeLists.txt b/print-manager/printer-manager-kcm/CMakeLists.txt index 4eb62bf6..3fedd483 100644 --- a/print-manager/printer-manager-kcm/CMakeLists.txt +++ b/print-manager/printer-manager-kcm/CMakeLists.txt @@ -13,5 +13,5 @@ target_link_libraries(kcm_printer_manager kcupslib ) -install(TARGETS kcm_printer_manager DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kcm_printer_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kcm_printer_manager DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES kcm_printer_manager.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/print-manager/printqueue/CMakeLists.txt b/print-manager/printqueue/CMakeLists.txt index b5ecf4b5..359957ac 100644 --- a/print-manager/printqueue/CMakeLists.txt +++ b/print-manager/printqueue/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(kde-print-queue kcupslib ) -install(TARGETS kde-print-queue DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS kde-print-queue DESTINATION ${KDE4_BIN_INSTALL_DIR}) diff --git a/skanlite/src/CMakeLists.txt b/skanlite/src/CMakeLists.txt index ed892e93..082f0b6d 100644 --- a/skanlite/src/CMakeLists.txt +++ b/skanlite/src/CMakeLists.txt @@ -15,4 +15,4 @@ add_executable(skanlite ${skanlite_SRCS}) target_link_libraries(skanlite ${KDE4_KIO_LIBS} ${PNG_LIBRARY} ksane) install(TARGETS skanlite ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( PROGRAMS skanlite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( PROGRAMS skanlite.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) diff --git a/svgpart/CMakeLists.txt b/svgpart/CMakeLists.txt index 27baaf52..52967c3d 100644 --- a/svgpart/CMakeLists.txt +++ b/svgpart/CMakeLists.txt @@ -11,6 +11,6 @@ kde4_add_plugin(svgpart ${svgpart_SRCS}) target_link_libraries(svgpart ${KDE4_KPARTS_LIBS}) -install(TARGETS svgpart DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES svgpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES svgpart.rc DESTINATION ${DATA_INSTALL_DIR}/svgpart) +install(TARGETS svgpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES svgpart.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES svgpart.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/svgpart) diff --git a/syndication/CMakeLists.txt b/syndication/CMakeLists.txt index 88d980d6..95014e44 100644 --- a/syndication/CMakeLists.txt +++ b/syndication/CMakeLists.txt @@ -153,4 +153,4 @@ install( FILES abstractparser.h specificitemvisitor.h syndication.h tools.h - DESTINATION ${INCLUDE_INSTALL_DIR}/syndication COMPONENT Devel) + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/syndication COMPONENT Devel) diff --git a/syndication/atom/CMakeLists.txt b/syndication/atom/CMakeLists.txt index bb2745f7..13b0832e 100644 --- a/syndication/atom/CMakeLists.txt +++ b/syndication/atom/CMakeLists.txt @@ -12,6 +12,6 @@ install(FILES parser.h person.h source.h - DESTINATION ${INCLUDE_INSTALL_DIR}/syndication/atom + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/syndication/atom COMPONENT Devel ) diff --git a/syndication/rdf/CMakeLists.txt b/syndication/rdf/CMakeLists.txt index dde1a554..c2b7703a 100644 --- a/syndication/rdf/CMakeLists.txt +++ b/syndication/rdf/CMakeLists.txt @@ -24,6 +24,6 @@ install(FILES syndicationinfo.h syndicationvocab.h textinput.h - DESTINATION ${INCLUDE_INSTALL_DIR}/syndication/rdf + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/syndication/rdf COMPONENT Devel ) diff --git a/syndication/rss2/CMakeLists.txt b/syndication/rss2/CMakeLists.txt index e0ba0c07..c08c9655 100644 --- a/syndication/rss2/CMakeLists.txt +++ b/syndication/rss2/CMakeLists.txt @@ -11,6 +11,6 @@ install(FILES rss2.h source.h textinput.h - DESTINATION ${INCLUDE_INSTALL_DIR}/syndication/rss2 + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/syndication/rss2 COMPONENT Devel ) diff --git a/thumbnailers/audio/CMakeLists.txt b/thumbnailers/audio/CMakeLists.txt index d504f5a2..f143b344 100644 --- a/thumbnailers/audio/CMakeLists.txt +++ b/thumbnailers/audio/CMakeLists.txt @@ -9,6 +9,6 @@ kde4_add_plugin(AudioThumbs ${AudioThumbs_SRCS}) target_link_libraries(AudioThumbs ${KDE4_KIO_LIBS} ${TAGLIB_LIBRARIES} ${FLAC_LIBRARIES}) -install(TARGETS AudioThumbs DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS AudioThumbs DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install(FILES AudioThumbs.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES AudioThumbs.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/thumbnailers/po/CMakeLists.txt b/thumbnailers/po/CMakeLists.txt index bcfb9817..a0667da4 100644 --- a/thumbnailers/po/CMakeLists.txt +++ b/thumbnailers/po/CMakeLists.txt @@ -10,6 +10,6 @@ target_link_libraries(pothumbnail ${GETTEXTPO_LIBRARY} ) -install(TARGETS pothumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES pocreatorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(FILES pothumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS pothumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES pocreatorsettings.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) +install(FILES pothumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/thumbnailers/ps/CMakeLists.txt b/thumbnailers/ps/CMakeLists.txt index b6643a3a..a9054755 100644 --- a/thumbnailers/ps/CMakeLists.txt +++ b/thumbnailers/ps/CMakeLists.txt @@ -8,10 +8,10 @@ kde4_add_plugin(gsthumbnail ${gsthumbnail_PART_SRCS}) target_link_libraries(gsthumbnail ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ) -install(TARGETS gsthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS gsthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES gsthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES gsthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) diff --git a/thumbnailers/raw/CMakeLists.txt b/thumbnailers/raw/CMakeLists.txt index 28241129..32000626 100644 --- a/thumbnailers/raw/CMakeLists.txt +++ b/thumbnailers/raw/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(rawthumbnail ) ## install the plugin -install(TARGETS rawthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES rawthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS rawthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES rawthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/yakuake/app/CMakeLists.txt b/yakuake/app/CMakeLists.txt index 8f79d6e3..421c85b0 100644 --- a/yakuake/app/CMakeLists.txt +++ b/yakuake/app/CMakeLists.txt @@ -31,4 +31,4 @@ endif(Q_WS_X11) install(TARGETS yakuake ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES yakuake.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES yakuake.knsrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR}) diff --git a/yakuake/data/CMakeLists.txt b/yakuake/data/CMakeLists.txt index 375d90eb..6f72545d 100644 --- a/yakuake/data/CMakeLists.txt +++ b/yakuake/data/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory( icons ) add_subdirectory( skins ) -install(PROGRAMS yakuake.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(PROGRAMS yakuake.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -install(FILES yakuake.notifyrc DESTINATION ${DATA_INSTALL_DIR}/yakuake) +install(FILES yakuake.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake) diff --git a/yakuake/data/icons/CMakeLists.txt b/yakuake/data/icons/CMakeLists.txt index 106884f4..248f55f5 100644 --- a/yakuake/data/icons/CMakeLists.txt +++ b/yakuake/data/icons/CMakeLists.txt @@ -1 +1 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${KDE4_ICON_INSTALL_DIR} ) diff --git a/yakuake/data/skins/CMakeLists.txt b/yakuake/data/skins/CMakeLists.txt index 428db68a..80b06aff 100644 --- a/yakuake/data/skins/CMakeLists.txt +++ b/yakuake/data/skins/CMakeLists.txt @@ -1,4 +1,4 @@ -install(FILES README DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins) +install(FILES README DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins) add_subdirectory( default ) add_subdirectory( plastik_light ) diff --git a/yakuake/data/skins/default/CMakeLists.txt b/yakuake/data/skins/default/CMakeLists.txt index 089c7416..5cce303f 100644 --- a/yakuake/data/skins/default/CMakeLists.txt +++ b/yakuake/data/skins/default/CMakeLists.txt @@ -2,7 +2,7 @@ install(FILES title.skin tabs.skin icon.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/default) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/default) install(FILES tabs/back_image.png @@ -20,7 +20,7 @@ install(FILES tabs/separator.png tabs/unselected_back.png tabs/lock.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/default/tabs) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/default/tabs) install(FILES title/back.png @@ -35,4 +35,4 @@ install(FILES title/quit_over.png title/quit_up.png title/right.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/default/title) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/default/title) diff --git a/yakuake/data/skins/plastik_dark/CMakeLists.txt b/yakuake/data/skins/plastik_dark/CMakeLists.txt index 32531aa7..4d7f6107 100644 --- a/yakuake/data/skins/plastik_dark/CMakeLists.txt +++ b/yakuake/data/skins/plastik_dark/CMakeLists.txt @@ -2,7 +2,7 @@ install(FILES title.skin tabs.skin icon.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/plastik_dark) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/plastik_dark) install(FILES tabs/back_image.png @@ -20,7 +20,7 @@ install(FILES tabs/separator.png tabs/unselected_back.png tabs/lock.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/plastik_dark/tabs) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/plastik_dark/tabs) install(FILES title/back.png @@ -35,4 +35,4 @@ install(FILES title/quit_over.png title/quit_up.png title/right.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/plastik_dark/title) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/plastik_dark/title) diff --git a/yakuake/data/skins/plastik_light/CMakeLists.txt b/yakuake/data/skins/plastik_light/CMakeLists.txt index 413a7d07..c90cde94 100644 --- a/yakuake/data/skins/plastik_light/CMakeLists.txt +++ b/yakuake/data/skins/plastik_light/CMakeLists.txt @@ -2,7 +2,7 @@ install(FILES title.skin tabs.skin icon.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/plastik_light) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/plastik_light) install(FILES tabs/back_image.png @@ -20,7 +20,7 @@ install(FILES tabs/separator.png tabs/unselected_back.png tabs/lock.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/plastik_light/tabs) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/plastik_light/tabs) install(FILES title/back.png @@ -35,4 +35,4 @@ install(FILES title/quit_over.png title/quit_up.png title/right.png - DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/plastik_light/title) + DESTINATION ${KDE4_DATA_INSTALL_DIR}/yakuake/skins/plastik_light/title) diff --git a/yakuake/po/ca/CMakeLists.txt b/yakuake/po/ca/CMakeLists.txt index 53c898a8..a224a9ab 100644 --- a/yakuake/po/ca/CMakeLists.txt +++ b/yakuake/po/ca/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( ca ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( ca ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/ca@valencia/CMakeLists.txt b/yakuake/po/ca@valencia/CMakeLists.txt index b8d8b07c..8cfd94bb 100644 --- a/yakuake/po/ca@valencia/CMakeLists.txt +++ b/yakuake/po/ca@valencia/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( ca@valencia ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( ca@valencia ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/cs/CMakeLists.txt b/yakuake/po/cs/CMakeLists.txt index 4512e660..2bc5e876 100644 --- a/yakuake/po/cs/CMakeLists.txt +++ b/yakuake/po/cs/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( cs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( cs ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/da/CMakeLists.txt b/yakuake/po/da/CMakeLists.txt index d1793c4c..e26a69fe 100644 --- a/yakuake/po/da/CMakeLists.txt +++ b/yakuake/po/da/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( da ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( da ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/de/CMakeLists.txt b/yakuake/po/de/CMakeLists.txt index 2346309a..e01b4f35 100644 --- a/yakuake/po/de/CMakeLists.txt +++ b/yakuake/po/de/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( de ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( de ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/el/CMakeLists.txt b/yakuake/po/el/CMakeLists.txt index dd59b1af..d0d5d5b1 100644 --- a/yakuake/po/el/CMakeLists.txt +++ b/yakuake/po/el/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( el ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( el ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/en_GB/CMakeLists.txt b/yakuake/po/en_GB/CMakeLists.txt index c53bd3b3..0705689a 100644 --- a/yakuake/po/en_GB/CMakeLists.txt +++ b/yakuake/po/en_GB/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( en_GB ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( en_GB ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/es/CMakeLists.txt b/yakuake/po/es/CMakeLists.txt index 6e120d6d..3dbec022 100644 --- a/yakuake/po/es/CMakeLists.txt +++ b/yakuake/po/es/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( es ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( es ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/et/CMakeLists.txt b/yakuake/po/et/CMakeLists.txt index 3bd03928..1f5fba8b 100644 --- a/yakuake/po/et/CMakeLists.txt +++ b/yakuake/po/et/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( et ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( et ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/fi/CMakeLists.txt b/yakuake/po/fi/CMakeLists.txt index f5e43fe4..7e9fdda3 100644 --- a/yakuake/po/fi/CMakeLists.txt +++ b/yakuake/po/fi/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( fi ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( fi ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/fr/CMakeLists.txt b/yakuake/po/fr/CMakeLists.txt index 423b4cad..2ab44b3a 100644 --- a/yakuake/po/fr/CMakeLists.txt +++ b/yakuake/po/fr/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( fr ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/ga/CMakeLists.txt b/yakuake/po/ga/CMakeLists.txt index 92e492da..445229c7 100644 --- a/yakuake/po/ga/CMakeLists.txt +++ b/yakuake/po/ga/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( ga ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( ga ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/hr/CMakeLists.txt b/yakuake/po/hr/CMakeLists.txt index c50ac147..2ac28146 100644 --- a/yakuake/po/hr/CMakeLists.txt +++ b/yakuake/po/hr/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( hr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( hr ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/hu/CMakeLists.txt b/yakuake/po/hu/CMakeLists.txt index 15c92057..cd520cab 100644 --- a/yakuake/po/hu/CMakeLists.txt +++ b/yakuake/po/hu/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( hu ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( hu ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/it/CMakeLists.txt b/yakuake/po/it/CMakeLists.txt index e4837ce9..485b34b7 100644 --- a/yakuake/po/it/CMakeLists.txt +++ b/yakuake/po/it/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( it ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( it ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/km/CMakeLists.txt b/yakuake/po/km/CMakeLists.txt index 4936b9dd..daf0f6ab 100644 --- a/yakuake/po/km/CMakeLists.txt +++ b/yakuake/po/km/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( km ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( km ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/ko/CMakeLists.txt b/yakuake/po/ko/CMakeLists.txt index 531e0805..e812f5d1 100644 --- a/yakuake/po/ko/CMakeLists.txt +++ b/yakuake/po/ko/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( ko ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( ko ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/nb/CMakeLists.txt b/yakuake/po/nb/CMakeLists.txt index 6086150e..36fff41f 100644 --- a/yakuake/po/nb/CMakeLists.txt +++ b/yakuake/po/nb/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( nb ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/nds/CMakeLists.txt b/yakuake/po/nds/CMakeLists.txt index dafa9078..cd602444 100644 --- a/yakuake/po/nds/CMakeLists.txt +++ b/yakuake/po/nds/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( nds ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( nds ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/nl/CMakeLists.txt b/yakuake/po/nl/CMakeLists.txt index b3128283..bdf03d97 100644 --- a/yakuake/po/nl/CMakeLists.txt +++ b/yakuake/po/nl/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( nl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( nl ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/nn/CMakeLists.txt b/yakuake/po/nn/CMakeLists.txt index abc4794d..a979ac06 100644 --- a/yakuake/po/nn/CMakeLists.txt +++ b/yakuake/po/nn/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( nn ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( nn ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/pa/CMakeLists.txt b/yakuake/po/pa/CMakeLists.txt index 4c189afd..b169aef7 100644 --- a/yakuake/po/pa/CMakeLists.txt +++ b/yakuake/po/pa/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( pa ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( pa ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/pl/CMakeLists.txt b/yakuake/po/pl/CMakeLists.txt index 64107bda..925b093f 100644 --- a/yakuake/po/pl/CMakeLists.txt +++ b/yakuake/po/pl/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( pl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( pl ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/pt/CMakeLists.txt b/yakuake/po/pt/CMakeLists.txt index 6916d85c..13b04770 100644 --- a/yakuake/po/pt/CMakeLists.txt +++ b/yakuake/po/pt/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( pt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( pt ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/pt_BR/CMakeLists.txt b/yakuake/po/pt_BR/CMakeLists.txt index 27b7a7a8..740a5192 100644 --- a/yakuake/po/pt_BR/CMakeLists.txt +++ b/yakuake/po/pt_BR/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( pt_BR ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( pt_BR ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/ro/CMakeLists.txt b/yakuake/po/ro/CMakeLists.txt index 8c08a20e..1cb3432d 100644 --- a/yakuake/po/ro/CMakeLists.txt +++ b/yakuake/po/ro/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( ro ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( ro ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/ru/CMakeLists.txt b/yakuake/po/ru/CMakeLists.txt index 231fa14b..5d2c5b41 100644 --- a/yakuake/po/ru/CMakeLists.txt +++ b/yakuake/po/ru/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( ru ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/sk/CMakeLists.txt b/yakuake/po/sk/CMakeLists.txt index 9b6d1b34..7b09881a 100644 --- a/yakuake/po/sk/CMakeLists.txt +++ b/yakuake/po/sk/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( sk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( sk ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/sr/CMakeLists.txt b/yakuake/po/sr/CMakeLists.txt index e9ad1fab..3c389195 100644 --- a/yakuake/po/sr/CMakeLists.txt +++ b/yakuake/po/sr/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( sr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( sr ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/sr@ijekavian/CMakeLists.txt b/yakuake/po/sr@ijekavian/CMakeLists.txt index 29210063..561c59d2 100644 --- a/yakuake/po/sr@ijekavian/CMakeLists.txt +++ b/yakuake/po/sr@ijekavian/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( sr@ijekavian ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( sr@ijekavian ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/sr@ijekavianlatin/CMakeLists.txt b/yakuake/po/sr@ijekavianlatin/CMakeLists.txt index 6871339d..3b15ea3b 100644 --- a/yakuake/po/sr@ijekavianlatin/CMakeLists.txt +++ b/yakuake/po/sr@ijekavianlatin/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( sr@ijekavianlatin ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( sr@ijekavianlatin ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/sr@latin/CMakeLists.txt b/yakuake/po/sr@latin/CMakeLists.txt index af0ad4bf..a4fa7b2e 100644 --- a/yakuake/po/sr@latin/CMakeLists.txt +++ b/yakuake/po/sr@latin/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( sr@latin ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( sr@latin ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/sv/CMakeLists.txt b/yakuake/po/sv/CMakeLists.txt index 852709ce..d1ed3069 100644 --- a/yakuake/po/sv/CMakeLists.txt +++ b/yakuake/po/sv/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( sv ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( sv ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/th/CMakeLists.txt b/yakuake/po/th/CMakeLists.txt index c9106422..c1ae8aeb 100644 --- a/yakuake/po/th/CMakeLists.txt +++ b/yakuake/po/th/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( th ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( th ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/tr/CMakeLists.txt b/yakuake/po/tr/CMakeLists.txt index 9687fc36..8049c46d 100644 --- a/yakuake/po/tr/CMakeLists.txt +++ b/yakuake/po/tr/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( tr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( tr ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/uk/CMakeLists.txt b/yakuake/po/uk/CMakeLists.txt index 451208b0..15989d70 100644 --- a/yakuake/po/uk/CMakeLists.txt +++ b/yakuake/po/uk/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( uk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( uk ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/wa/CMakeLists.txt b/yakuake/po/wa/CMakeLists.txt index ec5edbfc..d7740394 100644 --- a/yakuake/po/wa/CMakeLists.txt +++ b/yakuake/po/wa/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( wa ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( wa ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/zh_CN/CMakeLists.txt b/yakuake/po/zh_CN/CMakeLists.txt index 64885b9d..dada2831 100644 --- a/yakuake/po/zh_CN/CMakeLists.txt +++ b/yakuake/po/zh_CN/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( zh_CN ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( zh_CN ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} ) diff --git a/yakuake/po/zh_TW/CMakeLists.txt b/yakuake/po/zh_TW/CMakeLists.txt index 49345734..8af80eba 100644 --- a/yakuake/po/zh_TW/CMakeLists.txt +++ b/yakuake/po/zh_TW/CMakeLists.txt @@ -1,2 +1,2 @@ file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( zh_TW ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) +GETTEXT_PROCESS_PO_FILES( zh_TW ALL INSTALL_DESTINATION ${KDE4_LOCALE_INSTALL_DIR} ${_po_files} )