diff options
| author | David Faure <faure@kde.org> | 2021-11-23 17:31:42 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2021-11-23 17:31:42 +0100 |
| commit | 9f519983d628c7c2a68ee1a8dc7a1cbb83c8f535 (patch) | |
| tree | 0ba708cd158ceff0e712d89fd6fb3cfc392154fb /kde-modules/KDEInstallDirs5.cmake | |
| parent | 72b8ed99fd49d64465b808d45f1d001a88db31be (diff) | |
| download | extra-cmake-modules-9f519983d628c7c2a68ee1a8dc7a1cbb83c8f535.tar.gz extra-cmake-modules-9f519983d628c7c2a68ee1a8dc7a1cbb83c8f535.tar.bz2 | |
KDEInstallDirs5: set up KSERVICESDIR alias for KSERVICES5DIR
and use only KSERVICESDIR in KDEInstallDirs6.
Diffstat (limited to 'kde-modules/KDEInstallDirs5.cmake')
| -rw-r--r-- | kde-modules/KDEInstallDirs5.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake index 4a362d59..c3bbe307 100644 --- a/kde-modules/KDEInstallDirs5.cmake +++ b/kde-modules/KDEInstallDirs5.cmake @@ -76,18 +76,18 @@ deprecated variable name in square brackets): ``KCONFUPDATEDIR`` kconf_update scripts (``DATAROOTDIR/kconf_update``) [``KCONF_UPDATE_INSTALL_DIR``] -``KSERVICES5DIR`` +``KSERVICES5DIR`` or (since 5.89) ``KSERVICESDIR`` services for KDE Frameworks 5 (``DATAROOTDIR/kservices5``) [``SERVICES_INSTALL_DIR``] -``KSERVICETYPES5DIR`` +``KSERVICETYPES5DIR`` or (since 5.89) ``KSERVICETYPESDIR`` service types for KDE Frameworks 5 (``DATAROOTDIR/kservicetypes5``) [``SERVICETYPES_INSTALL_DIR``] -``KXMLGUI5DIR`` +``KXMLGUI5DIR`` or (since 5.89) ``KXMLGUIDIR`` knotify description files (``DATAROOTDIR/kxmlgui5``) [``KXMLGUI_INSTALL_DIR``] ``KTEMPLATESDIR`` Kapptemplate and Kdevelop templates (``kdevappwizard/templates``) -``KNOTIFY5RCDIR`` +``KNOTIFY5RCDIR`` or (since 5.89) ``KNOTIFYRCDIR`` knotify description files (``DATAROOTDIR/knotifications5``) [``KNOTIFYRC_INSTALL_DIR``] ``ICONDIR`` @@ -321,16 +321,16 @@ endif() # KDE Framework-specific things _define_relative(KSERVICES5DIR DATAROOTDIR "kservices5" "services for KDE Frameworks 5" - SERVICES_INSTALL_DIR) + SERVICES_INSTALL_DIR KSERVICESDIR) _define_relative(KSERVICETYPES5DIR DATAROOTDIR "kservicetypes5" "service types for KDE Frameworks 5" - SERVICETYPES_INSTALL_DIR) + SERVICETYPES_INSTALL_DIR KSERVICETYPESDIR) _define_relative(KNOTIFY5RCDIR DATAROOTDIR "knotifications5" "knotify description files" - KNOTIFYRC_INSTALL_DIR) + KNOTIFYRC_INSTALL_DIR KNOTIFYRCDIR) _define_relative(KXMLGUI5DIR DATAROOTDIR "kxmlgui5" "kxmlgui .rc files" - KXMLGUI_INSTALL_DIR) + KXMLGUI_INSTALL_DIR KXMLGUIDIR) _define_relative(LOGGINGCATEGORIESDIR DATAROOTDIR "qlogging-categories5" "Qt Logging categories files") @@ -344,12 +344,12 @@ _define_relative(LOGGINGCATEGORIESDIR DATAROOTDIR "qlogging-categories5" # -only the development files: cmake -DCOMPONENT=Devel -P cmake_install.cmake # -everything except the development files: cmake -DCOMPONENT=Unspecified -P cmake_install.cmake # This can then also be used for packaging with cpack. -# FIXME: why is INCLUDES (only) set for ARCHIVE targets? set(KF5_INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT Devel INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR_KF5}" ) +set(KF_INSTALL_TARGETS_DEFAULT_ARGS ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) # on the Mac support an extra install directory for application bundles if(APPLE) |