summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-18 15:55:35 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-12-18 15:55:35 (GMT)
commitf9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (patch)
treebd0c8b159a29f3d88be6bd20eb10bbb58df9da39 /Modules
parent5ffdd37b7ff8279ffffbf8cc5a007a541be0d7ff (diff)
parent24cdb9df598a1c10fffc718255527729595442a1 (diff)
downloadCMake-f9e3ca46cbeae4fb885398e8f7b90c784078b1d3.zip
CMake-f9e3ca46cbeae4fb885398e8f7b90c784078b1d3.tar.gz
CMake-f9e3ca46cbeae4fb885398e8f7b90c784078b1d3.tar.bz2
Merge topic 'release-wix-config-ng'
24cdb9df CMake: Mimic NSIS options dialog in WiX installer de77d4a7 CPackWIX: Allow multiple patch files and diagnose if any are missing 38d723b3 CPackWIX: Allow patching of shortcut components
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackWIX.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index bef8e16..4994005 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -119,7 +119,8 @@
#
# .. variable:: CPACK_WIX_PATCH_FILE
#
-# Optional XML file with fragments to be inserted into generated WiX sources
+# Optional list of XML files with fragments to be inserted into
+# generated WiX sources
#
# This optional variable can be used to specify an XML file that the
# WiX generator will use to inject fragments into its generated