diff options
| author | David Faure <faure@kde.org> | 2021-06-24 15:05:48 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2021-11-23 17:22:51 +0100 |
| commit | 83da29a62e544c1b8e6e125e32ba39845b175b92 (patch) | |
| tree | c6703665ebe41b8d2d3cbb10e3ae349900ce0db1 /kde-modules | |
| parent | 6c148bcee77a5f0fc319eef209c3a1cba0b430d1 (diff) | |
| download | extra-cmake-modules-83da29a62e544c1b8e6e125e32ba39845b175b92.tar.gz extra-cmake-modules-83da29a62e544c1b8e6e125e32ba39845b175b92.tar.bz2 | |
KDEInstallDirs6: don't set deprecated variable names anymore
+ adjust docu
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDEInstallDirs5.cmake | 4 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirs6.cmake | 6 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirsCommon.cmake | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake index 92fdc149..4a362d59 100644 --- a/kde-modules/KDEInstallDirs5.cmake +++ b/kde-modules/KDEInstallDirs5.cmake @@ -357,4 +357,8 @@ if(APPLE) BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}" ) endif() +if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) + set(INSTALL_TARGETS_DEFAULT_ARGS ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +endif() + include(${CMAKE_CURRENT_LIST_DIR}/KDESetupPrefixScript.cmake) diff --git a/kde-modules/KDEInstallDirs6.cmake b/kde-modules/KDEInstallDirs6.cmake index 8f784857..0f25204f 100644 --- a/kde-modules/KDEInstallDirs6.cmake +++ b/kde-modules/KDEInstallDirs6.cmake @@ -12,6 +12,9 @@ KDEInstallDirs6 --------------- +THIS IS CURRENTLY ONLY AN ALPHA VERSION, FOR FRAMEWORKS USAGE ONLY, +AND TO BE MODIFIED INCREMENTALLY. PLEASE DO NOT USE IN APPLICATIONS YET. + Define KDE standard installation directories for Qt6/KF6 based software. Note that none of the variables defined by this module provide any @@ -208,13 +211,12 @@ be used on the command line when possible (eg: use ``-DKDE_INSTALL_LIBDIR=lib64`` instead of ``-DKDE_INSTALL_LIBDIR=/usr/lib/lib64`` to override the library directory). -Since 5.82.0. - The ``KDE_INSTALL_PREFIX_SCRIPT`` option will install a ${CMAKE_INSTALL_PREFIX}/prefix.sh file that allows to easily incorporate the necessary environment variables for the prefix into a process. #]=======================================================================] +set(KDE_INSTALL_DIRS_NO_DEPRECATED TRUE) include(${CMAKE_CURRENT_LIST_DIR}/KDEInstallDirsCommon.cmake) diff --git a/kde-modules/KDEInstallDirsCommon.cmake b/kde-modules/KDEInstallDirsCommon.cmake index 98d643f4..f0177c05 100644 --- a/kde-modules/KDEInstallDirsCommon.cmake +++ b/kde-modules/KDEInstallDirsCommon.cmake @@ -377,10 +377,6 @@ if(APPLE) BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}" ) endif() -if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) - set(INSTALL_TARGETS_DEFAULT_ARGS ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -endif() - # new in cmake 2.8.9: this is used for all installed files which do not have a component set # so set the default component name to the name of the project, if a project name has been set: if(NOT "${PROJECT_NAME}" STREQUAL "Project") |