This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via db5583de060221ed7af339eb1a9101d43794f11a (commit)
via 67384cf24f1431e3db942ab10e42eb79276611bd (commit)
from e9ecfbc0de78bda55e0fae8fe3c0fcab63d6a231 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db5583de060221ed7af339eb1a9101d43794f11a
commit db5583de060221ed7af339eb1a9101d43794f11a
Merge: e9ecfbc 67384cf
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Jan 14 17:08:46 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 14 17:08:46 2015 -0500
Merge topic 'windows-utf-8' into next
67384cf2 Fix release note for windows-utf-8, and update cmake-language docs.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67384cf24f1431e3db942ab10e42eb79276611bd
commit 67384cf24f1431e3db942ab10e42eb79276611bd
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Jan 14 15:07:55 2015 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Wed Jan 14 15:07:55 2015 -0700
Fix release note for windows-utf-8, and update cmake-language docs.
In cmake-language, a note was added about UTF-8 support on Windows.
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 15c101f..1d4b09c 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -60,15 +60,16 @@ Syntax
Encoding
--------
-A CMake Language source file must be written in 7-bit ASCII text
-to be portable across all supported platforms. Newlines may be
+A CMake Language source file may be written in 7-bit ASCII text for
+maximum portability across all supported platforms. Newlines may be
encoded as either ``\n`` or ``\r\n`` but will be converted to ``\n``
as input files are read.
Note that the implementation is 8-bit clean so source files may
be encoded as UTF-8 on platforms with system APIs supporting this
-encoding. Furthermore, CMake 3.0 and above allow a leading UTF-8
-`Byte-Order Mark`_ in source files.
+encoding. In addition, CMake 3.2 and above support UTF-8 files on
+Windows while using UTF-16 to call system APIs. Furthermore, CMake 3.0
+and above allow a leading UTF-8 `Byte-Order Mark`_ in source files.
.. _`Byte-Order Mark`: http://en.wikipedia.org/wiki/Byte_order_mark
diff --git a/Help/release/dev/windows-utf-8.rst
b/Help/release/dev/windows-utf-8.rst
index fe02153..9438cdc 100644
--- a/Help/release/dev/windows-utf-8.rst
+++ b/Help/release/dev/windows-utf-8.rst
@@ -11,7 +11,7 @@ windows-utf-8
Latin 1 languages such as those found in North and South America and Western
Europe. With UTF-8, additional languages are supported.
- The CMakeLists.txt file and other files read by CMake file are expected
- to be UTF-8 encoded. If files are already ASCII, they will be compatible.
- If files were in a different encoding, including Latin 1, they will need to
- be converted.
+ Files written in the :manual:`cmake-language(7)`, such as
+ ``CMakeLists.txt`` for ``*.cmake`` files are expected to be UTF-8 encoded.
+ If files are already ASCII, they will be compatible. If files were in a
+ different encoding, including Latin 1, they will need to be converted.
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-language.7.rst | 9 +++++----
Help/release/dev/windows-utf-8.rst | 8 ++++----
2 files changed, 9 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
