diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-03 15:06:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-03 15:06:25 (GMT) |
| commit | 909c0533d0422e9c3204e2d7b58a18b208c7e695 (patch) | |
| tree | 8d1da127e924b6efd141381108a7c7b7d1338863 /Modules | |
| parent | d57bc8797d36b7a267a15063b3248f8461b3e648 (diff) | |
| parent | 642fa25da095b346d559ad39624eda79b0bd2ff8 (diff) | |
| download | CMake-909c0533d0422e9c3204e2d7b58a18b208c7e695.zip CMake-909c0533d0422e9c3204e2d7b58a18b208c7e695.tar.gz CMake-909c0533d0422e9c3204e2d7b58a18b208c7e695.tar.bz2 | |
Merge topic 'wix-additions'
642fa25d CPackWIX: support installation of empty directories
378eb5b7 CPackWIX: Allow Windows Installer property customization
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackWIX.cmake | 17 | ||||
| -rw-r--r-- | Modules/WIX.template.in | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 39183c6..0a47e19 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -216,9 +216,24 @@ # allow other CMake projects to find your package with # the :command:`find_package` command. # +# .. variable:: CPACK_WIX_PROPERTY_<PROPERTY> +# +# This variable can be used to provide a value for +# the Windows Installer property ``<PROPERTY>`` +# +# The follwing list contains some example properties that can be used to +# customize information under +# "Programs and Features" (also known as "Add or Remove Programs") +# +# * ARPCOMMENTS - Comments +# * ARPHELPLINK - Help and support information URL +# * ARPURLINFOABOUT - General information URL +# * URLUPDATEINFO - Update information URL +# * ARPHELPTELEPHONE - Help and support telephone number +# * ARPSIZE - Size (in kilobytes) of the application #============================================================================= -# Copyright 2013 Kitware, Inc. +# Copyright 2014 Kitware, Inc. # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in index 59a75c7..bbb7c88 100644 --- a/Modules/WIX.template.in +++ b/Modules/WIX.template.in @@ -40,5 +40,7 @@ <FeatureRef Id="ProductFeature"/> <UIRef Id="$(var.CPACK_WIX_UI_REF)" /> + + <?include "properties.wxi"?> </Product> </Wix> |