[Cmake-commits] CMake branch, next, updated. v2.8.7-3087-g638bcf2

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  638bcf23310fef7a74c3f52292d151e6b8184c76 (commit)
       via  d4719a8d369466eae7aa4d9491a4729376292e3c (commit)
      from  7f2ecf88bc9eec8f9de2cdad70d14852f3170da6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=638bcf23310fef7a74c3f52292d151e6b8184c76
commit 638bcf23310fef7a74c3f52292d151e6b8184c76
Merge: 7f2ecf8 d4719a8
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Mar 6 17:26:05 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 6 17:26:05 2012 -0500

    Merge topic 'CPackNSIS-addMissingDoc' into next
    
    d4719a8 Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4719a8d369466eae7aa4d9491a4729376292e3c
commit d4719a8d369466eae7aa4d9491a4729376292e3c
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Mar 6 23:23:08 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Mar 6 23:23:08 2012 +0100

    Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.

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- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake.html" "CMake Help"
+#         "http://www.cmake.org" "CMake Web Site")
+##end
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.

-----------------------------------------------------------------------

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


hooks/post-receive
-- 
CMake