diff options
| author | David Cole <david.cole@kitware.com> | 2012-04-25 18:05:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-04-25 18:05:52 (GMT) |
| commit | d2230cdb5ed291087c9f1dd3fe6d66f2c5a8c760 (patch) | |
| tree | 23fdd815a884f55f942037fc2437fc1e06cffd8f | |
| parent | 44e2bdc7a5be4021bb5a8eef53bf87685955f263 (diff) | |
| parent | aa8acea3982582cb8e20f69ec897aed6dd31a0a5 (diff) | |
| download | CMake-d2230cdb5ed291087c9f1dd3fe6d66f2c5a8c760.zip CMake-d2230cdb5ed291087c9f1dd3fe6d66f2c5a8c760.tar.gz CMake-d2230cdb5ed291087c9f1dd3fe6d66f2c5a8c760.tar.bz2 | |
Merge topic 'fix-13085-add-nsis-preinstall-hook'
aa8acea CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)
| -rw-r--r-- | Modules/CPackNSIS.cmake | 14 | ||||
| -rw-r--r-- | Modules/NSIS.template.in | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake index 5e2ba17..66c33a8 100644 --- a/Modules/CPackNSIS.cmake +++ b/Modules/CPackNSIS.cmake @@ -31,13 +31,21 @@ ##end # ##variable -# CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra NSIS commands that will -# be added to the install Section. +# CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS - Extra NSIS commands that +# will be added to the beginning of the install Section, before your +# install tree is available on the target system. +##end +# +##variable +# CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra NSIS commands that +# will be added to the end of the install Section, after your +# install tree is available on the target system. ##end # ##variable # CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra NSIS commands that will -# be added to the uninstall Section. +# be added to the uninstall Section, before your install tree is +# removed from the target system. ##end # ##variable diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index 819cc5c..e7edead 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -637,6 +637,7 @@ Section "-Core installation" ;Use the entire tree produced by the INSTALL target. Keep the ;list of directories here in sync with the RMDir commands below. SetOutPath "$INSTDIR" + @CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS@ @CPACK_NSIS_FULL_INSTALL@ ;Store installation folder |