summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-10 16:24:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-10 16:24:56 (GMT)
commit27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf (patch)
tree7d115a5379590f0b575639516723adad574a500e /Modules
parent6e149e1591249d4666b4f7eefd58f414c4b5d973 (diff)
parentb78d74de64c989444210b203fb8f1183b2fd0929 (diff)
downloadCMake-27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf.zip
CMake-27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf.tar.gz
CMake-27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf.tar.bz2
Merge topic 'wix_desktop'
b78d74de CPackWiX: Add support for CPACK_CREATE_DESKTOP_LINKS
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPack.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index ccc36eb..89547af 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -174,7 +174,7 @@
# create Start Menu shortcuts. For example, setting this to the list
# ccmake;CMake will create a shortcut named "CMake" that will execute the
# installed executable ccmake. Not all CPack generators use it (at least
-# NSIS and OSXX11 do).
+# NSIS, WIX and OSXX11 do).
#
# .. variable:: CPACK_STRIP_FILES
#
@@ -261,6 +261,8 @@
# .. variable:: CPACK_CREATE_DESKTOP_LINKS
#
# List of desktop links to create.
+# Each desktop link requires a corresponding start menu shortcut
+# as created by :variable:`CPACK_PACKAGE_EXECUTABLES`.
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.