diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-27 16:36:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-27 16:36:45 (GMT) |
| commit | a47b904db242abb903a968bd6109bc8a07d3c39a (patch) | |
| tree | d8338d1db985fd98956688244d746e808a83bd3e /Help | |
| parent | c1f5d6e6f54f8b61d223476459970d336098429c (diff) | |
| parent | 1f77a7001b2e3f8f9224cb603e5acfee45573064 (diff) | |
| download | CMake-a47b904db242abb903a968bd6109bc8a07d3c39a.zip CMake-a47b904db242abb903a968bd6109bc8a07d3c39a.tar.gz CMake-a47b904db242abb903a968bd6109bc8a07d3c39a.tar.bz2 | |
Merge topic 'file-strings-utf-16'
1f77a700 file: Teach STRINGS to support UTF-16 and UTF-32 encodings
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/file.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/file-strings-utf-16.rst | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst index b0d4792..73d4cfa 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -65,7 +65,10 @@ Parse a list of ASCII strings from ``<filename>`` and store it in Consider only strings that match the given regular expression. ``ENCODING <encoding-type>`` - Consider strings of a given encoding. "UTF-8" is currently supported. + Consider strings of a given encoding. Currently supported encodings are: + UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE. If the ENCODING option + is not provided and the file has a Byte Order Mark, the ENCODING option + will be defaulted to respect the Byte Order Mark. For example, the code diff --git a/Help/release/dev/file-strings-utf-16.rst b/Help/release/dev/file-strings-utf-16.rst new file mode 100644 index 0000000..f40b63e --- /dev/null +++ b/Help/release/dev/file-strings-utf-16.rst @@ -0,0 +1,5 @@ +file-strings-utf-16 +------------------- + +* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE, + UTF-32LE, UTF-32BE as ``ENCODING`` options. |