From 72b8ed99fd49d64465b808d45f1d001a88db31be Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 24 Jun 2021 19:49:15 +0200 Subject: KDEInstallDirs6: remove deprecated variables from the documentation --- kde-modules/KDEInstallDirs6.cmake | 83 +++++++++++++-------------------------- 1 file changed, 27 insertions(+), 56 deletions(-) diff --git a/kde-modules/KDEInstallDirs6.cmake b/kde-modules/KDEInstallDirs6.cmake index 7ea86f40..5677a1c2 100644 --- a/kde-modules/KDEInstallDirs6.cmake +++ b/kde-modules/KDEInstallDirs6.cmake @@ -30,88 +30,73 @@ Inclusion of this module defines the following variables: ``KDE_INSTALL_FULL_`` corresponding absolute path -where ```` is one of (default values in parentheses and alternative, -deprecated variable name in square brackets): +where ```` is one of (default values in parentheses): ``BUNDLEDIR`` - application bundles (``/Applications/KDE``) [``BUNDLE_INSTALL_DIR``] + application bundles (``/Applications/KDE``) ``EXECROOTDIR`` - executables and libraries (````) [``EXEC_INSTALL_PREFIX``] + executables and libraries (````) ``BINDIR`` - user executables (``EXECROOTDIR/bin``) [``BIN_INSTALL_DIR``] + user executables (``EXECROOTDIR/bin``) ``SBINDIR`` - system admin executables (``EXECROOTDIR/sbin``) [``SBIN_INSTALL_DIR``] + system admin executables (``EXECROOTDIR/sbin``) ``LIBDIR`` object code libraries (``EXECROOTDIR/lib``, ``EXECROOTDIR/lib64`` or - ``EXECROOTDIR/lib/`` variables (or their ``CMAKE_INSTALL_`` or -deprecated counterparts) may be passed to the DESTINATION options of +The ``KDE_INSTALL_`` variables may be passed to the DESTINATION options of ``install()`` commands for the corresponding file type. They are set in the CMake cache, and so the defaults above can be overridden by users. -Note that the ``KDE_INSTALL_``, ``CMAKE_INSTALL_`` or deprecated -form of the variable can be changed using CMake command line variable -definitions; in either case, all forms of the variable will be affected. The -effect of passing multiple forms of the same variable on the command line +Note that the ``KDE_INSTALL_`` or ``CMAKE_INSTALL_`` variables +can be changed using CMake command line variable definitions; in either case, +both forms of the variable will be affected. The effect of passing multiple +forms of the same variable on the command line (such as ``KDE_INSTALL_BINDIR`` and ``CMAKE_INSTALL_BINDIR`` is undefined. -The variable ``KDE_INSTALL_TARGETS_DEFAULT_ARGS`` is also defined (along with -the deprecated form ``INSTALL_TARGETS_DEFAULT_ARGS``). This should be used -when libraries or user-executable applications are installed, in the -following manner: +The variable ``KDE_INSTALL_TARGETS_DEFAULT_ARGS`` is also defined. +This should be used when libraries or user-executable applications are installed, +in the following manner: .. code-block:: cmake -- cgit v1.2.1