diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-05 14:17:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-05 14:17:47 (GMT) |
| commit | fe263c9882c820fbcf969b9be6e18087e91e4ae1 (patch) | |
| tree | cc64273d159a2b7ea5002b5ecc032fcd6441ae96 /Modules | |
| parent | 0d17a82b0b703847cd78f33a9461286876e1d0dc (diff) | |
| parent | fde8dfa417e1862e6ca7f6b1e9cb5c4ed9f86b9c (diff) | |
| download | CMake-fe263c9882c820fbcf969b9be6e18087e91e4ae1.zip CMake-fe263c9882c820fbcf969b9be6e18087e91e4ae1.tar.gz CMake-fe263c9882c820fbcf969b9be6e18087e91e4ae1.tar.bz2 | |
Merge topic 'cpack-wix-root'
fde8dfa4 CPackWIX: Add documentation for CPACK_WIX_ROOT
fb22ba63 CPackWIX: Fix variable documentation indentations
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !665
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackWIX.cmake | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 5a36e4c..1dc37d4 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -243,20 +243,20 @@ # # .. variable:: CPACK_WIX_ROOT_FEATURE_TITLE # -# Sets the name of the root install feature in the WIX installer. Same as -# CPACK_COMPONENT_<compName>_DISPLAY_NAME for components. +# Sets the name of the root install feature in the WIX installer. Same as +# CPACK_COMPONENT_<compName>_DISPLAY_NAME for components. # # .. variable:: CPACK_WIX_ROOT_FEATURE_DESCRIPTION # -# Sets the description of the root install feature in the WIX installer. Same as -# CPACK_COMPONENT_<compName>_DESCRIPTION for components. +# Sets the description of the root install feature in the WIX installer. Same as +# CPACK_COMPONENT_<compName>_DESCRIPTION for components. # # .. variable:: CPACK_WIX_SKIP_PROGRAM_FOLDER # -# If this variable is set to true, the default install location -# of the generated package will be CPACK_PACKAGE_INSTALL_DIRECTORY directly. -# The install location will not be located relatively below -# ProgramFiles or ProgramFiles64. +# If this variable is set to true, the default install location +# of the generated package will be CPACK_PACKAGE_INSTALL_DIRECTORY directly. +# The install location will not be located relatively below +# ProgramFiles or ProgramFiles64. # # .. note:: # Installers created with this feature do not take differences @@ -270,14 +270,22 @@ # # .. variable:: CPACK_WIX_ROOT_FOLDER_ID # -# This variable allows specification of a custom root folder ID. -# The generator specific ``<64>`` token can be used for -# folder IDs that come in 32-bit and 64-bit variants. -# In 32-bit builds the token will expand empty while in 64-bit builds -# it will expand to ``64``. +# This variable allows specification of a custom root folder ID. +# The generator specific ``<64>`` token can be used for +# folder IDs that come in 32-bit and 64-bit variants. +# In 32-bit builds the token will expand empty while in 64-bit builds +# it will expand to ``64``. # -# When unset generated installers will default installing to -# ``ProgramFiles<64>Folder``. +# When unset generated installers will default installing to +# ``ProgramFiles<64>Folder``. +# +# .. variable:: CPACK_WIX_ROOT +# +# This variable can optionally be set to the root directory +# of a custom WiX Toolset installation. +# +# When unspecified CPack will try to locate a WiX Toolset +# installation via the ``WIX`` environment variable instead. # if(NOT CPACK_WIX_ROOT) |