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 60316739d134a6c76e435746f4c6009220e533a9 (commit)
via b359ee994ea80fccd7eff1b01e33cbcce879a545 (commit)
via 4c53670b6444b16e8d39a46aebd39fc166895755 (commit)
from 0492ede11b4f4b396a5f2f5ccbcb0a7bcb0e2167 (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=60316739d134a6c76e435746f4c6009220e533a9
commit 60316739d134a6c76e435746f4c6009220e533a9
Merge: 0492ede b359ee9
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Jan 26 18:30:26 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 26 18:30:26 2015 -0500
Merge topic 'file-strings-utf-16' into next
b359ee99 Add documentation for new ENCODING options in file(STRINGS).
4c53670b Move test cases for file(STRINGS .. ENCODING ...) to
Tests/RunCMake.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b359ee994ea80fccd7eff1b01e33cbcce879a545
commit b359ee994ea80fccd7eff1b01e33cbcce879a545
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Jan 26 16:28:00 2015 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Jan 26 16:30:05 2015 -0700
Add documentation for new ENCODING options in file(STRINGS).
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.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c53670b6444b16e8d39a46aebd39fc166895755
commit 4c53670b6444b16e8d39a46aebd39fc166895755
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Jan 26 15:27:36 2015 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Jan 26 15:27:36 2015 -0700
Move test cases for file(STRINGS .. ENCODING ...) to Tests/RunCMake.
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake
b/Tests/RunCMake/string/RunCMakeTest.cmake
index fc913c6..89f7ea5 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -12,3 +12,8 @@ run_cmake(UuidMissingTypeValue)
run_cmake(UuidBadType)
run_cmake(RegexClear)
+
+run_cmake(UTF-16BE)
+run_cmake(UTF-16LE)
+run_cmake(UTF-32BE)
+run_cmake(UTF-32LE)
diff --git a/Tests/RunCMake/string/UTF-16BE-stderr.txt
b/Tests/RunCMake/string/UTF-16BE-stderr.txt
new file mode 100644
index 0000000..8254f87
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16BE-stderr.txt
@@ -0,0 +1,2 @@
+Hello World
+Hello World
diff --git a/Tests/RunCMake/string/UTF-16BE.cmake
b/Tests/RunCMake/string/UTF-16BE.cmake
new file mode 100644
index 0000000..da986c0
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16BE.cmake
@@ -0,0 +1,4 @@
+file(STRINGS UTF-16BE.txt str ENCODING UTF-16BE LENGTH_MINIMUM 4)
+message("${str}")
+file(STRINGS UTF-16BE.txt str LENGTH_MINIMUM 4)
+message("${str}")
diff --git a/Tests/StringFileTest/UTF-16BE.txt
b/Tests/RunCMake/string/UTF-16BE.txt
similarity index 100%
rename from Tests/StringFileTest/UTF-16BE.txt
rename to Tests/RunCMake/string/UTF-16BE.txt
diff --git a/Tests/RunCMake/string/UTF-16LE-stderr.txt
b/Tests/RunCMake/string/UTF-16LE-stderr.txt
new file mode 100644
index 0000000..8254f87
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16LE-stderr.txt
@@ -0,0 +1,2 @@
+Hello World
+Hello World
diff --git a/Tests/RunCMake/string/UTF-16LE.cmake
b/Tests/RunCMake/string/UTF-16LE.cmake
new file mode 100644
index 0000000..326d848
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16LE.cmake
@@ -0,0 +1,4 @@
+file(STRINGS UTF-16LE.txt str ENCODING UTF-16LE LENGTH_MINIMUM 4)
+message("${str}")
+file(STRINGS UTF-16LE.txt str LENGTH_MINIMUM 4)
+message("${str}")
diff --git a/Tests/StringFileTest/UTF-16LE.txt
b/Tests/RunCMake/string/UTF-16LE.txt
similarity index 100%
rename from Tests/StringFileTest/UTF-16LE.txt
rename to Tests/RunCMake/string/UTF-16LE.txt
diff --git a/Tests/RunCMake/string/UTF-32BE-stderr.txt
b/Tests/RunCMake/string/UTF-32BE-stderr.txt
new file mode 100644
index 0000000..8254f87
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-32BE-stderr.txt
@@ -0,0 +1,2 @@
+Hello World
+Hello World
diff --git a/Tests/RunCMake/string/UTF-32BE.cmake
b/Tests/RunCMake/string/UTF-32BE.cmake
new file mode 100644
index 0000000..debdeaa
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-32BE.cmake
@@ -0,0 +1,4 @@
+file(STRINGS UTF-32BE.txt str ENCODING UTF-32BE LENGTH_MINIMUM 4)
+message("${str}")
+file(STRINGS UTF-32BE.txt str LENGTH_MINIMUM 4)
+message("${str}")
diff --git a/Tests/StringFileTest/UTF-32BE.txt
b/Tests/RunCMake/string/UTF-32BE.txt
similarity index 100%
rename from Tests/StringFileTest/UTF-32BE.txt
rename to Tests/RunCMake/string/UTF-32BE.txt
diff --git a/Tests/RunCMake/string/UTF-32LE-stderr.txt
b/Tests/RunCMake/string/UTF-32LE-stderr.txt
new file mode 100644
index 0000000..8254f87
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-32LE-stderr.txt
@@ -0,0 +1,2 @@
+Hello World
+Hello World
diff --git a/Tests/RunCMake/string/UTF-32LE.cmake
b/Tests/RunCMake/string/UTF-32LE.cmake
new file mode 100644
index 0000000..22aab5f
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-32LE.cmake
@@ -0,0 +1,4 @@
+file(STRINGS UTF-32LE.txt str ENCODING UTF-32LE LENGTH_MINIMUM 4)
+message("${str}")
+file(STRINGS UTF-32LE.txt str LENGTH_MINIMUM 4)
+message("${str}")
diff --git a/Tests/StringFileTest/UTF-32LE.txt
b/Tests/RunCMake/string/UTF-32LE.txt
similarity index 100%
rename from Tests/StringFileTest/UTF-32LE.txt
rename to Tests/RunCMake/string/UTF-32LE.txt
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index 539b854..faf3bc9 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -65,32 +65,6 @@ else()
"file(STRINGS) incorrectly read from utf8 file [${infile_strings}]")
endif()
-# check files with UTF-16 or UTF-32 content
-foreach(bit 16 32)
- foreach(endian LE BE)
- set(file_to_check UTF-${bit}${endian}.txt)
- file(STRINGS ${file_to_check} str ENCODING UTF-${bit}${endian}
LENGTH_MINIMUM 4)
- message("${file_to_check} as UTF-${bit}${endian}: ${str}")
- if(NOT str MATCHES "Hello World")
- message(SEND_ERROR
- "file(STRINGS) incorrectly read from ${file_to_check} file
[${str}]")
- endif()
- endforeach()
-endforeach()
-
-# check files using BOM for encoding
-foreach(bit 16 32)
- foreach(endian LE BE)
- set(file_to_check UTF-${bit}${endian}.txt)
- file(STRINGS ${file_to_check} str REGEX "....")
- message("${file_to_check} : ${str}")
- if(NOT str MATCHES "Hello World")
- message(SEND_ERROR
- "file(STRINGS) incorrectly read from ${file_to_check} file
[${str}]")
- endif()
- endforeach()
-endforeach()
-
# String test
string(REGEX MATCH "[cC][mM][aA][kK][eE]" rmvar "CMake is great")
string(REGEX MATCHALL "[cC][mM][aA][kK][eE]" rmallvar "CMake is better than
cmake or CMake")
-----------------------------------------------------------------------
Summary of changes:
Help/command/file.rst | 5 +++-
Help/release/dev/file-strings-utf-16.rst | 5 ++++
Tests/RunCMake/string/RunCMakeTest.cmake | 5 ++++
.../NO-BOM.txt.in => string/UTF-16BE-stderr.txt} | 1 +
Tests/RunCMake/string/UTF-16BE.cmake | 4 +++
.../string}/UTF-16BE.txt | Bin 83 -> 83 bytes
.../NO-BOM.txt.in => string/UTF-16LE-stderr.txt} | 1 +
Tests/RunCMake/string/UTF-16LE.cmake | 4 +++
.../string}/UTF-16LE.txt | Bin 83 -> 83 bytes
.../NO-BOM.txt.in => string/UTF-32BE-stderr.txt} | 1 +
Tests/RunCMake/string/UTF-32BE.cmake | 4 +++
.../string}/UTF-32BE.txt | Bin 165 -> 165 bytes
.../NO-BOM.txt.in => string/UTF-32LE-stderr.txt} | 1 +
Tests/RunCMake/string/UTF-32LE.cmake | 4 +++
.../string}/UTF-32LE.txt | Bin 165 -> 165 bytes
Tests/StringFileTest/CMakeLists.txt | 26 --------------------
16 files changed, 34 insertions(+), 27 deletions(-)
create mode 100644 Help/release/dev/file-strings-utf-16.rst
copy Tests/RunCMake/{configure_file/NO-BOM.txt.in =>
string/UTF-16BE-stderr.txt} (50%)
create mode 100644 Tests/RunCMake/string/UTF-16BE.cmake
rename Tests/{StringFileTest => RunCMake/string}/UTF-16BE.txt (100%)
copy Tests/RunCMake/{configure_file/NO-BOM.txt.in =>
string/UTF-16LE-stderr.txt} (50%)
create mode 100644 Tests/RunCMake/string/UTF-16LE.cmake
rename Tests/{StringFileTest => RunCMake/string}/UTF-16LE.txt (100%)
copy Tests/RunCMake/{configure_file/NO-BOM.txt.in =>
string/UTF-32BE-stderr.txt} (50%)
create mode 100644 Tests/RunCMake/string/UTF-32BE.cmake
rename Tests/{StringFileTest => RunCMake/string}/UTF-32BE.txt (100%)
copy Tests/RunCMake/{configure_file/NO-BOM.txt.in =>
string/UTF-32LE-stderr.txt} (50%)
create mode 100644 Tests/RunCMake/string/UTF-32LE.cmake
rename Tests/{StringFileTest => RunCMake/string}/UTF-32LE.txt (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
