diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-27 14:32:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-27 14:32:51 (GMT) |
| commit | d5f54967831851a5625b05920939004f1bb0c92e (patch) | |
| tree | 694947c30adaf20e4c380bbfc2dd396a48b8a6ee /Help | |
| parent | 647ff12ca65ef4d1ac1bae70bd6ce558d95bfb23 (diff) | |
| parent | 95719297018a35f58be49ec09162296df5e520ee (diff) | |
| download | CMake-d5f54967831851a5625b05920939004f1bb0c92e.zip CMake-d5f54967831851a5625b05920939004f1bb0c92e.tar.gz CMake-d5f54967831851a5625b05920939004f1bb0c92e.tar.bz2 | |
Merge topic 'cpack-dmg-rtf-for-sla'
9571929701 CPack/DragNDrop: Support RTF licenses
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4270
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/cpack_gen/dmg.rst | 8 | ||||
| -rw-r--r-- | Help/release/dev/cpack-dmg-rtf-for-sla.rst | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Help/cpack_gen/dmg.rst b/Help/cpack_gen/dmg.rst index 35320c2..cede0f2 100644 --- a/Help/cpack_gen/dmg.rst +++ b/Help/cpack_gen/dmg.rst @@ -54,10 +54,12 @@ on macOS: Directory where license and menu files for different languages are stored. Setting this causes CPack to look for a ``<language>.menu.txt`` and - ``<language>.license.txt`` file for every language defined in - ``CPACK_DMG_SLA_LANGUAGES``. If both this variable and + ``<language>.license.txt`` or ``<language>.license.rtf`` file for every + language defined in ``CPACK_DMG_SLA_LANGUAGES``. If both this variable and ``CPACK_RESOURCE_FILE_LICENSE`` are set, CPack will only look for the menu - files and use the same license file for all languages. + files and use the same license file for all languages. If both + ``<language>.license.txt`` and ``<language>.license.rtf`` exist, the ``.txt`` + file will be used. .. variable:: CPACK_DMG_SLA_LANGUAGES diff --git a/Help/release/dev/cpack-dmg-rtf-for-sla.rst b/Help/release/dev/cpack-dmg-rtf-for-sla.rst new file mode 100644 index 0000000..5941796 --- /dev/null +++ b/Help/release/dev/cpack-dmg-rtf-for-sla.rst @@ -0,0 +1,8 @@ +cpack-dmg-rtf-for-sla +--------------------- + +* The :cpack_gen:`CPack DragNDrop Generator` learned to handle + RTF formatted license files. When :variable:`CPACK_DMG_SLA_DIR` + variable is set, <language>.license.rtf is considered, but + only as a fallback when the plaintext (.txt) file is not found + in order to maintain backwards compatibility. |