diff options
author | Andrew Fuller <afuller@teradici.com> | 2020-01-23 16:50:45 (GMT) |
---|---|---|
committer | Andrew Fuller <afuller@teradici.com> | 2020-01-24 15:48:52 (GMT) |
commit | 95719297018a35f58be49ec09162296df5e520ee (patch) | |
tree | 04e35ac2147fc316dd7b454e2a0e05a9d02a24aa /Help | |
parent | ab2fc918216011a03f0fe7696e7bba67fc2627b3 (diff) | |
download | CMake-95719297018a35f58be49ec09162296df5e520ee.zip CMake-95719297018a35f58be49ec09162296df5e520ee.tar.gz CMake-95719297018a35f58be49ec09162296df5e520ee.tar.bz2 |
CPack/DragNDrop: Support RTF licenses
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. |