diff options
author | Craig Scott <craig.scott@crascit.com> | 2021-03-24 05:35:49 (GMT) |
---|---|---|
committer | Craig Scott <craig.scott@crascit.com> | 2021-03-24 05:35:49 (GMT) |
commit | f226a1678fe27817649ec536ad2923a98a7646a3 (patch) | |
tree | 4dcd4542800405850f46d1efafc7a9c260bc5afb /Help/cpack_gen | |
parent | a6a52563955a5a42e1fec856d65479444ba5fbdc (diff) | |
parent | 88060f471766222c54a080900f73abf29586a6f4 (diff) | |
download | CMake-f226a1678fe27817649ec536ad2923a98a7646a3.zip CMake-f226a1678fe27817649ec536ad2923a98a7646a3.tar.gz CMake-f226a1678fe27817649ec536ad2923a98a7646a3.tar.bz2 |
Merge branch 'master' into nsis-branding-trim-position
Diffstat (limited to 'Help/cpack_gen')
-rw-r--r-- | Help/cpack_gen/dmg.rst | 6 | ||||
-rw-r--r-- | Help/cpack_gen/nsis.rst | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Help/cpack_gen/dmg.rst b/Help/cpack_gen/dmg.rst index 4c662a6..ec2cf1e 100644 --- a/Help/cpack_gen/dmg.rst +++ b/Help/cpack_gen/dmg.rst @@ -103,6 +103,12 @@ on macOS: - Default: ``CPACK_PACKAGE_FILE_NAME-<component>`` +.. variable:: CPACK_DMG_FILESYSTEM + + The filesystem format. Common values are ``APFS`` and ``HFS+``. + See ``man hdiutil`` for a full list of supported formats. + Defaults to ``HFS+``. + .. variable:: CPACK_COMMAND_HDIUTIL Path to the ``hdiutil(1)`` command used to operate on disk image files on diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst index de1f3b5..02e33ba 100644 --- a/Help/cpack_gen/nsis.rst +++ b/Help/cpack_gen/nsis.rst @@ -195,3 +195,9 @@ on Windows Nullsoft Scriptable Install System. If set, trim down the size of the control to the size of the branding text string. Allowed values for this variable are ``LEFT``, ``CENTER`` or ``RIGHT``. If not specified, the default behavior is ``LEFT``. + +.. variable:: CPACK_NSIS_EXECUTABLE + + .. versionadded:: 3.21 + + If set, specify the name of the NSIS executable. Default is ``makensis``. |