diff options
| author | Volker Krause <vkrause@kde.org> | 2021-11-30 16:59:32 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2021-12-05 00:13:05 +0000 |
| commit | 744494e6cdaee066064b9fecd86040e3b232a2f7 (patch) | |
| tree | a0ba7ff43298b02f92217a1e2d77198ff8dda4df | |
| parent | 4047638680ab6c31618798cb20f26eac76dee20a (diff) | |
| download | extra-cmake-modules-744494e6cdaee066064b9fecd86040e3b232a2f7.tar.gz extra-cmake-modules-744494e6cdaee066064b9fecd86040e3b232a2f7.tar.bz2 | |
Define version-less install targets in KDEInstallDirs5.cmake
This enables forward-compatibility with KDEInstallDirs6.cmake
This was partly done already, but in the wrong order and not for all
versioned variables.
| -rw-r--r-- | kde-modules/KDEInstallDirs5.cmake | 7 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirs6.cmake | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake index c3bbe307..a7e12b79 100644 --- a/kde-modules/KDEInstallDirs5.cmake +++ b/kde-modules/KDEInstallDirs5.cmake @@ -349,7 +349,6 @@ set(KF5_INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${CMAKE_INSTALL_BINDI 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) @@ -361,4 +360,10 @@ if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) set(INSTALL_TARGETS_DEFAULT_ARGS ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) endif() +# version-less forward compatibility variants, see also KDEInstallDirs6.cmake +set(KF_INSTALL_TARGETS_DEFAULT_ARGS ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +_define_non_cache(INCLUDEDIR_KF "${KDE_INSTALL_INCLUDEDIR_KF5}") +_define_non_cache(DATADIR_KF "${KDE_INSTALL_DATADIR_KF5}") +_define_non_cache(LIBEXECDIR_KF "${KDE_INSTALL_LIBEXECDIR_KF5}") + include(${CMAKE_CURRENT_LIST_DIR}/KDESetupPrefixScript.cmake) diff --git a/kde-modules/KDEInstallDirs6.cmake b/kde-modules/KDEInstallDirs6.cmake index 71c1de80..fecd1b10 100644 --- a/kde-modules/KDEInstallDirs6.cmake +++ b/kde-modules/KDEInstallDirs6.cmake @@ -293,7 +293,7 @@ set(KF_INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR} # on the Mac support an extra install directory for application bundles if(APPLE) - set(KF6_INSTALL_TARGETS_DEFAULT_ARGS ${KF6_INSTALL_TARGETS_DEFAULT_ARGS} + set(KF_INSTALL_TARGETS_DEFAULT_ARGS ${KF_INSTALL_TARGETS_DEFAULT_ARGS} BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}" ) endif() |