diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-20 13:39:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-20 13:39:15 (GMT) |
| commit | 30d2d34611d52c35b11a6a87b58b256005d70adc (patch) | |
| tree | 8d392f6480da0d995cd7b0f54e078934c1c00c23 | |
| parent | 57a29e9d31419f17d04c09f44b15147661038dd8 (diff) | |
| parent | c92b96234acfe142df88cd1ba5815373721d5c22 (diff) | |
| download | CMake-30d2d34611d52c35b11a6a87b58b256005d70adc.zip CMake-30d2d34611d52c35b11a6a87b58b256005d70adc.tar.gz CMake-30d2d34611d52c35b11a6a87b58b256005d70adc.tar.bz2 | |
Merge topic 'nsis-utf-8-bom'
c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5392
| -rw-r--r-- | Help/release/dev/cpack-nsis-utf-8-bom.rst | 6 | ||||
| -rw-r--r-- | Modules/Internal/CPack/NSIS.template.in | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Help/release/dev/cpack-nsis-utf-8-bom.rst b/Help/release/dev/cpack-nsis-utf-8-bom.rst new file mode 100644 index 0000000..b2a20ce --- /dev/null +++ b/Help/release/dev/cpack-nsis-utf-8-bom.rst @@ -0,0 +1,6 @@ +cpack-nsis-utf8-bom +------------------- + +* The :cpack_gen:`CPack NSIS Generator` now handles correctly Unicode characters. + If you want to have a ``CPACK_RESOURCE_FILE_LICENSE`` with UTF-8 characters + it needs to be encoded in UTF-8 BOM. diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in index 6009ce0..b448c76 100644 --- a/Modules/Internal/CPack/NSIS.template.in +++ b/Modules/Internal/CPack/NSIS.template.in @@ -1,4 +1,4 @@ -; CPack install script designed for a nmake build +; CPack install script designed for a nmake build ;-------------------------------- ; You must define these values |