kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'CPackNSIS-addMissingDoc' 

d4719a8 Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.
This commit is contained in:
David Cole 2012-03-08 15:13:51 -05:00 committed by CMake Topic Stage
parent 9cdd989667 d4719a8d36
commit 9f6c38253a
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/CPack.cmake
View File

@ -101,6 +101,11 @@
##end ##end
# #
##variable ##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 # CPACK_PROJECT_CONFIG_FILE - CPack-time project CPack configuration
# file. This file included at cpack time, once per # file. This file included at cpack time, once per
# generator after CPack has set CPACK_GENERATOR to the actual generator # generator after CPack has set CPACK_GENERATOR to the actual generator
@ -247,6 +252,15 @@
# CPACK_INSTALLED_DIRECTORIES - Extra directories to install. # CPACK_INSTALLED_DIRECTORIES - Extra directories to install.
##end ##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. # Copyright 2006-2009 Kitware, Inc.

19
Modules/CPackNSIS.cmake
View File

@ -8,11 +8,6 @@
##end ##end
# #
##variable ##variable
# CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Registry key used when
# installing this project.
##end
#
##variable
# CPACK_NSIS_INSTALL_ROOT - The default installation directory presented # CPACK_NSIS_INSTALL_ROOT - The default installation directory presented
# to the end user by the NSIS installer is under this root dir. The full # to the end user by the NSIS installer is under this root dir. The full
# directory presented to the end user is: # directory presented to the end user is:
@ -30,11 +25,6 @@
##end ##end
# #
##variable ##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 # CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra NSIS commands that will
# be added to the install Section. # be added to the install Section.
##end ##end
@ -107,6 +97,15 @@
# CPACK_NSIS_MUI_FINISHPAGE_RUN - Specify an executable to add an option # CPACK_NSIS_MUI_FINISHPAGE_RUN - Specify an executable to add an option
# to run on the finish page of the NSIS installer. # to run on the finish page of the NSIS installer.
##end ##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. # Copyright 2006-2009 Kitware, Inc.