summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-15 13:33:22 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-15 13:33:22 (GMT)
commit69fd12583c18e42338aabfa67cd1791571a2c86e (patch)
tree0dd785b7eb64873a740bad39f38468c9b64d8b09 /Modules
parentcd36929c278d69c00850144932d931676ed5f889 (diff)
parent2e6cadde13690a80bc3919cec00e802208367f32 (diff)
downloadCMake-69fd12583c18e42338aabfa67cd1791571a2c86e.zip
CMake-69fd12583c18e42338aabfa67cd1791571a2c86e.tar.gz
CMake-69fd12583c18e42338aabfa67cd1791571a2c86e.tar.bz2
Merge topic 'wix-extra-sources'
2e6cadd CPackWiX: allow user supplied extra sources, objects and libraries
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackWIX.cmake14
1 files changed, 14 insertions, 0 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index fce25f0..604eb37 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -102,6 +102,20 @@
# If this variable is not set, the default MSI template included with CMake will be used.
#
##end
+##variable
+# CPACK_WIX_EXTRA_SOURCES - Extra WiX source files
+#
+# This variable provides an optional list of extra WiX source files (.wxs)
+# that should be compiled and linked. The full path to source files is required.
+#
+##end
+##variable
+# CPACK_WIX_EXTRA_OBJECTS - Extra WiX object files or libraries
+#
+# This variable provides an optional list of extra WiX object (.wixobj) and/or
+# WiX library (.wixlib) files. The full path to objects and libraries is required.
+#
+##end
#=============================================================================
# Copyright 2012 Kitware, Inc.