summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-23 16:06:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-23 16:06:07 (GMT)
commitcb16c7844dce627ab40f404c6ac49db3cde7b0c0 (patch)
tree7c7d02394c21403d1ef2cf41a34551ed2da0d30c /Help/manual
parent7cebc5acacc14e0d4c9416735c86c5870671f173 (diff)
parent6cc01c140245749bb6a6d5096b4a38f3f16fb776 (diff)
downloadCMake-cb16c7844dce627ab40f404c6ac49db3cde7b0c0.zip
CMake-cb16c7844dce627ab40f404c6ac49db3cde7b0c0.tar.gz
CMake-cb16c7844dce627ab40f404c6ac49db3cde7b0c0.tar.bz2
Merge topic 'wix-shortcut-properties'
6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic. 135febf0 CPackWIX: Enhance CMake CPack WIX generated installer. e6731f48 CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property. 279605f5 CPackWIX: Add installed file properties for the creation of shortcuts. 53d7daff CPackWIX: Refactor start menu and desktop shortcut creation. dc0f3fb4 CPackWIX: Explicitly list CPack WIX headers for IDE convenience.
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-properties.7.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 25f989f..19fdf23 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -320,8 +320,11 @@ Properties on Installed Files
.. toctree::
:maxdepth: 1
+ /prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
/prop_inst/CPACK_NEVER_OVERWRITE.rst
/prop_inst/CPACK_PERMANENT.rst
+ /prop_inst/CPACK_START_MENU_SHORTCUTS.rst
+ /prop_inst/CPACK_STARTUP_SHORTCUTS.rst
/prop_inst/CPACK_WIX_ACL.rst