diff options
author | Brad King <brad.king@kitware.com> | 2020-02-12 14:35:16 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-12 14:35:22 (GMT) |
commit | 9fc86efe4a400810882e0eba99c20a9ae9c1e950 (patch) | |
tree | a701858fc7e035872548427cbaf740d24a65e087 /Modules | |
parent | 645474dba1a9a4d5ed29eb0fabbedc9a9008dc5e (diff) | |
parent | e240371ab1e8a104bf13277ff18a61defd7902cb (diff) | |
download | CMake-9fc86efe4a400810882e0eba99c20a9ae9c1e950.zip CMake-9fc86efe4a400810882e0eba99c20a9ae9c1e950.tar.gz CMake-9fc86efe4a400810882e0eba99c20a9ae9c1e950.tar.bz2 |
Merge topic 'cpack-ifw-qt-links' into release-3.17
e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF
78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4348
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CPackIFW.cmake | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index 42ef8c7..f58f9ef 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -5,15 +5,12 @@ CPackIFW -------- -The documentation for the CPack IFW generator has moved here: :cpack_gen:`CPack IFW Generator` - -.. _QtIFW: http://doc.qt.io/qtinstallerframework/index.html - -This module looks for the location of the command line utilities supplied -with the Qt Installer Framework (QtIFW_). +This module looks for the location of the command-line utilities supplied with the +`Qt Installer Framework <http://doc.qt.io/qtinstallerframework/index.html>`_ +(QtIFW). The module also defines several commands to control the behavior of the -CPack ``IFW`` generator. +:cpack_gen:`CPack IFW Generator`. Commands ^^^^^^^^ @@ -102,10 +99,10 @@ The module defines the following commands: ``DEPENDS`` | ``DEPENDENCIES`` list of dependency component or component group identifiers in - QtIFW_ style. + QtIFW style. ``AUTO_DEPEND_ON`` - list of identifiers of component or component group in QtIFW_ style + list of identifiers of component or component group in QtIFW style that this component has an automatic dependency on. ``LICENSES`` @@ -207,10 +204,10 @@ The module defines the following commands: ``DEPENDS`` | ``DEPENDENCIES`` list of dependency component or component group identifiers in - QtIFW_ style. + QtIFW style. ``AUTO_DEPEND_ON`` - list of identifiers of component or component group in QtIFW_ style + list of identifiers of component or component group in QtIFW style that this component group has an automatic dependency on. ``LICENSES`` @@ -242,7 +239,7 @@ The module defines the following commands: .. command:: cpack_ifw_add_repository - Add QtIFW_ specific remote repository to binary installer. + Add QtIFW specific remote repository to binary installer. :: @@ -273,7 +270,7 @@ The module defines the following commands: .. command:: cpack_ifw_update_repository - Update QtIFW_ specific repository from remote repository. + Update QtIFW specific repository from remote repository. :: |