summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-02 17:07:24 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-02 17:07:24 (GMT)
commited1de30da06a22bc6d9cfd147a99f7728f175802 (patch)
tree1b4c0899f270d04c7e099045e436688f46cf2e36 /Modules
parent55f2a3d62754001fe44209f513ed81f90dab9338 (diff)
parent7b390f75e82ad79f6759656c52825c89e5c92902 (diff)
downloadCMake-ed1de30da06a22bc6d9cfd147a99f7728f175802.zip
CMake-ed1de30da06a22bc6d9cfd147a99f7728f175802.tar.gz
CMake-ed1de30da06a22bc6d9cfd147a99f7728f175802.tar.bz2
Merge topic 'wix-components'
7b390f7 CPackWiX: add CPack component support
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackWIX.cmake8
-rw-r--r--Modules/WIX.template.in2
2 files changed, 9 insertions, 1 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 3f0978d..237c5bc 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -63,6 +63,14 @@
#
# If set, this icon is used in place of the default icon.
#
+# .. variable:: CPACK_WIX_UI_REF
+#
+# This variable allows you to override the Id of the ``<UIRef>`` element
+# in the WiX template.
+#
+# The default is ``WixUI_InstallDir`` in case no CPack components have
+# been defined and ``WixUI_FeatureTree`` otherwise.
+#
# .. variable:: CPACK_WIX_UI_BANNER
#
# The bitmap will appear at the top of all installer pages other than the
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index 0bc7e10..59a75c7 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -39,6 +39,6 @@
<FeatureRef Id="ProductFeature"/>
- <UIRef Id="WixUI_InstallDir" />
+ <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
</Product>
</Wix>