From d4719a8d369466eae7aa4d9491a4729376292e3c Mon Sep 17 00:00:00 2001
From: Eric NOULARD <eric.noulard@gmail.com>
Date: Tue, 6 Mar 2012 23:23:08 +0100
Subject: Add some missing CPACK_NSIS_xxx doc and move some to common CPack
 section.

---
 Modules/CPack.cmake     | 14 ++++++++++++++
 Modules/CPackNSIS.cmake | 19 +++++++++----------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index b506711..571770e 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -101,6 +101,11 @@
 ##end
 #
 ##variable
+#   CPACK_PACKAGE_ICON - A branding image that will be displayed inside
+#   the installer (used by GUI installers).
+##end
+#
+##variable
 #  CPACK_PROJECT_CONFIG_FILE - CPack-time project CPack configuration
 #  file. This file included at cpack time, once per
 #  generator after CPack has set CPACK_GENERATOR to the actual generator
@@ -247,6 +252,15 @@
 #  CPACK_INSTALLED_DIRECTORIES - Extra directories to install.
 ##end
 #
+##variable
+#   CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Registry key used when
+#   installing this project. This is only used
+#   by installer for Windows.
+##end
+##variable
+#   CPACK_CREATE_DESKTOP_LINKS - List of desktop links to create.
+##end
+#
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index 97179d7..7d9f29b 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -8,11 +8,6 @@
 ##end
 #
 ##variable
-#   CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Registry key used when
-#   installing this project.
-##end
-#
-##variable
 #   CPACK_NSIS_INSTALL_ROOT - The default installation directory presented
 #   to the end user by the NSIS installer is under this root dir. The full
 #   directory presented to the end user is:
@@ -30,11 +25,6 @@
 ##end
 #
 ##variable
-#   CPACK_PACKAGE_ICON - A branding image that will be displayed inside
-#   the installer.
-##end
-#
-##variable
 #   CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra NSIS commands that will
 #   be added to the install Section.
 ##end
@@ -107,6 +97,15 @@
 #   CPACK_NSIS_MUI_FINISHPAGE_RUN - Specify an executable to add an option
 #   to run on the finish page of the NSIS installer.
 ##end
+##variable
+#   CPACK_NSIS_MENU_LINKS - Specify links in [application] menu.
+#   This should contain a list of pair "link" "link name". The link
+#   may be an URL or a path relative to installation prefix.
+#   Like:
+#     set(CPACK_NSIS_MENU_LINKS
+#         "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help"
+#         "http://www.cmake.org" "CMake Web Site")
+##end
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
-- 
cgit v0.12