diff options
| author | Johnny Jazeix <jazeix@gmail.com> | 2022-09-24 20:42:09 (GMT) |
|---|---|---|
| committer | Johnny Jazeix <jazeix@gmail.com> | 2022-09-26 15:58:12 (GMT) |
| commit | d1613ac880df62b171f7f929d98dfaa62dd78417 (patch) | |
| tree | 243952b99a3c9f44df59231092b501db71b0ab09 /Help | |
| parent | c87fb83426228fed2f6fb0109d810910f53da65b (diff) | |
| download | CMake-d1613ac880df62b171f7f929d98dfaa62dd78417.zip CMake-d1613ac880df62b171f7f929d98dfaa62dd78417.tar.gz CMake-d1613ac880df62b171f7f929d98dfaa62dd78417.tar.bz2 | |
CPack/NSIS: Add options to set makensis arguments
Fixes: #23446
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/cpack_gen/nsis.rst | 31 | ||||
| -rw-r--r-- | Help/release/dev/cpack-nsis-arguments-command-line.rst | 7 |
2 files changed, 38 insertions, 0 deletions
diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst index 299cfec..df306c2 100644 --- a/Help/cpack_gen/nsis.rst +++ b/Help/cpack_gen/nsis.rst @@ -207,3 +207,34 @@ on Windows Nullsoft Scriptable Install System. .. versionadded:: 3.22 If set, do not display the page containing the license during installation. + +.. variable:: CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS + + .. versionadded:: 3.25 + + This variable is a :ref:`semicolon-separated list <CMake Language Lists>` of + arguments to prepend to the nsis script to run. + If the arguments do not start with a ``/`` or a ``-``, it will add one + automatically to the corresponding arguments. + The command that will be run is:: + + makensis.exe <preArgs>... "nsisFileName.nsi" <postArgs>... + + where ``<preArgs>...`` is constructed from ``CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS`` + and ``<postArgs>...`` is constructed from ``CPACK_NSIS_EXECUTABLE_POST_ARGUMENTS``. + + +.. variable:: CPACK_NSIS_EXECUTABLE_POST_ARGUMENTS + + .. versionadded:: 3.25 + + This variable is a :ref:`semicolon-separated list <CMake Language Lists>` of + arguments to append to the nsis script to run. + If the arguments do not start with a ``/`` or a ``-``, it will add one + automatically to the corresponding arguments. + The command that will be run is:: + + makensis.exe <preArgs>... "nsisFileName.nsi" <postArgs>... + + where ``<preArgs>...`` is constructed from ``CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS`` + and ``<postArgs>...`` is constructed from ``CPACK_NSIS_EXECUTABLE_POST_ARGUMENTS``. diff --git a/Help/release/dev/cpack-nsis-arguments-command-line.rst b/Help/release/dev/cpack-nsis-arguments-command-line.rst new file mode 100644 index 0000000..610a338 --- /dev/null +++ b/Help/release/dev/cpack-nsis-arguments-command-line.rst @@ -0,0 +1,7 @@ +cpack-nsis-arguments-command-line +--------------------------------- + +* The :cpack_gen:`CPack NSIS Generator` gained two new variables + :variable:`CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS` and + :variable:`CPACK_NSIS_EXECUTABLE_POST_ARGUMENTS` + to provide arguments to the nsis executable invocation. |