[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1062-gefbcf83

Clinton Stimpson clinton at elemtech.com
Fri Mar 14 11:21:47 EDT 2014 

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  efbcf83a7fae0cf29133de33345fe58357f3eb81 (commit)
       via  b2e4b18b72b5732d5537e4a38c6f58ab5ad15144 (commit)
      from  8da0919bad430951b01b953b649ef640e65ad4cb (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=efbcf83a7fae0cf29133de33345fe58357f3eb81
commit efbcf83a7fae0cf29133de33345fe58357f3eb81
Merge: 8da0919 b2e4b18
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 14 11:21:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 14 11:21:46 2014 -0400

    Merge topic 'configure_file-unicode' into next
    
    b2e4b18b Unicode: Add test for configure_file() handling of Byte Order Mark.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2e4b18b72b5732d5537e4a38c6f58ab5ad15144
commit b2e4b18b72b5732d5537e4a38c6f58ab5ad15144
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 14 09:20:45 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Mar 14 09:20:45 2014 -0600

    Unicode: Add test for configure_file() handling of Byte Order Mark.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d401a93..a8726f4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -95,6 +95,7 @@ add_RunCMake_test(TargetPolicies)
 add_RunCMake_test(alias_targets)
 add_RunCMake_test(interface_library)
 add_RunCMake_test(no_install_prefix)
+add_RunCMake_test(configure_file)
 
 find_package(Qt4 QUIET)
 find_package(Qt5Core QUIET)
diff --git a/Tests/RunCMake/configure_file/CMakeLists.txt b/Tests/RunCMake/configure_file/CMakeLists.txt
new file mode 100644
index 0000000..2897109
--- /dev/null
+++ b/Tests/RunCMake/configure_file/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.0)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/configure_file/NO-BOM.cmake b/Tests/RunCMake/configure_file/NO-BOM.cmake
new file mode 100644
index 0000000..003d526
--- /dev/null
+++ b/Tests/RunCMake/configure_file/NO-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(NO-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/NO-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/NO-BOM.txt.in b/Tests/RunCMake/configure_file/NO-BOM.txt.in
new file mode 100644
index 0000000..557db03
--- /dev/null
+++ b/Tests/RunCMake/configure_file/NO-BOM.txt.in
@@ -0,0 +1 @@
+Hello World
diff --git a/Tests/RunCMake/configure_file/RunCMakeTest.cmake b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
new file mode 100644
index 0000000..c8bfa57
--- /dev/null
+++ b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
@@ -0,0 +1,8 @@
+include(RunCMake)
+
+run_cmake(NO-BOM)
+run_cmake(UTF8-BOM)
+run_cmake(UTF16LE-BOM)
+run_cmake(UTF16BE-BOM)
+run_cmake(UTF32LE-BOM)
+run_cmake(UTF32BE-BOM)
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-result.txt b/Tests/RunCMake/configure_file/UTF16BE-BOM-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
new file mode 100644
index 0000000..1dff60e
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
@@ -0,0 +1,5 @@
+CMake Error: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF16BE-BOM.txt.in
+CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
+  configure_file Problem configuring file
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM.cmake b/Tests/RunCMake/configure_file/UTF16BE-BOM.cmake
new file mode 100644
index 0000000..c570742
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(UTF16BE-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/UTF16BE-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in b/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
new file mode 100644
index 0000000..70fd9cb
Binary files /dev/null and b/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in differ
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM-result.txt b/Tests/RunCMake/configure_file/UTF16LE-BOM-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
new file mode 100644
index 0000000..85b5f83
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
@@ -0,0 +1,5 @@
+CMake Error: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF16LE-BOM.txt.in
+CMake Error at UTF16LE-BOM.cmake:2 \(configure_file\):
+  configure_file Problem configuring file
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM.cmake b/Tests/RunCMake/configure_file/UTF16LE-BOM.cmake
new file mode 100644
index 0000000..05c9cd7
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(UTF16LE-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/UTF16LE-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in b/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
new file mode 100644
index 0000000..036f8c5
Binary files /dev/null and b/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in differ
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM-result.txt b/Tests/RunCMake/configure_file/UTF32BE-BOM-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
new file mode 100644
index 0000000..7eb46f5
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
@@ -0,0 +1,5 @@
+CMake Error: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF32BE-BOM.txt.in
+CMake Error at UTF32BE-BOM.cmake:2 \(configure_file\):
+  configure_file Problem configuring file
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM.cmake b/Tests/RunCMake/configure_file/UTF32BE-BOM.cmake
new file mode 100644
index 0000000..0c6ea87
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(UTF32BE-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/UTF32BE-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in b/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
new file mode 100644
index 0000000..c87cfd5
Binary files /dev/null and b/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in differ
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM-result.txt b/Tests/RunCMake/configure_file/UTF32LE-BOM-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
new file mode 100644
index 0000000..8ea1fe9
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
@@ -0,0 +1,5 @@
+CMake Error: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF32LE-BOM.txt.in
+CMake Error at UTF32LE-BOM.cmake:2 \(configure_file\):
+  configure_file Problem configuring file
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM.cmake b/Tests/RunCMake/configure_file/UTF32LE-BOM.cmake
new file mode 100644
index 0000000..b6351b0
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(UTF32LE-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/UTF32LE-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in b/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
new file mode 100644
index 0000000..27c8183
Binary files /dev/null and b/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in differ
diff --git a/Tests/RunCMake/configure_file/UTF8-BOM.cmake b/Tests/RunCMake/configure_file/UTF8-BOM.cmake
new file mode 100644
index 0000000..af2adae
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF8-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(UTF8-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/UTF8-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/UTF8-BOM.txt.in b/Tests/RunCMake/configure_file/UTF8-BOM.txt.in
new file mode 100644
index 0000000..abc0aca
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF8-BOM.txt.in
@@ -0,0 +1 @@
+Hello World

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                                  |    1 +
 .../{cmake_minimum_required => configure_file}/CMakeLists.txt  |    2 +-
 Tests/RunCMake/configure_file/NO-BOM.cmake                     |    2 ++
 Tests/RunCMake/configure_file/NO-BOM.txt.in                    |    1 +
 Tests/RunCMake/configure_file/RunCMakeTest.cmake               |    8 ++++++++
 .../UTF16BE-BOM-result.txt}                                    |    0
 Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt           |    5 +++++
 Tests/RunCMake/configure_file/UTF16BE-BOM.cmake                |    2 ++
 Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in               |  Bin 0 -> 26 bytes
 .../UTF16LE-BOM-result.txt}                                    |    0
 Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt           |    5 +++++
 Tests/RunCMake/configure_file/UTF16LE-BOM.cmake                |    2 ++
 Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in               |  Bin 0 -> 26 bytes
 .../UTF32BE-BOM-result.txt}                                    |    0
 Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt           |    5 +++++
 Tests/RunCMake/configure_file/UTF32BE-BOM.cmake                |    2 ++
 Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in               |  Bin 0 -> 52 bytes
 .../UTF32LE-BOM-result.txt}                                    |    0
 Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt           |    5 +++++
 Tests/RunCMake/configure_file/UTF32LE-BOM.cmake                |    2 ++
 Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in               |  Bin 0 -> 52 bytes
 Tests/RunCMake/configure_file/UTF8-BOM.cmake                   |    2 ++
 Tests/RunCMake/configure_file/UTF8-BOM.txt.in                  |    1 +
 23 files changed, 44 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{cmake_minimum_required => configure_file}/CMakeLists.txt (63%)
 create mode 100644 Tests/RunCMake/configure_file/NO-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/NO-BOM.txt.in
 create mode 100644 Tests/RunCMake/configure_file/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF16BE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF16BE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF16LE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF16LE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF32BE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF32BE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF32LE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF32LE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
 create mode 100644 Tests/RunCMake/configure_file/UTF8-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF8-BOM.txt.in


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list