[Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-292-g9aaf287
Kitware Robot
kwrobot at kitware.com
Fri Nov 10 07:45:04 EST 2017
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, master has been updated
via 9aaf287d634db618c2961a063a3dda36d13d645b (commit)
via 9ffb9cb873c08e801abbbc46c9df691d406e43d0 (commit)
from c1a55e333f99062530386b51675b9ea3c4bf40c9 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9aaf287d634db618c2961a063a3dda36d13d645b
commit 9aaf287d634db618c2961a063a3dda36d13d645b
Merge: c1a55e3 9ffb9cb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 12:42:44 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 10 07:42:48 2017 -0500
Merge topic 'test-CTestTest2-intl'
9ffb9cb8 Tests: In CTestTest2 configure KWSys encoding to match CMake
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1468
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ffb9cb873c08e801abbbc46c9df691d406e43d0
commit 9ffb9cb873c08e801abbbc46c9df691d406e43d0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 9 08:01:06 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 9 08:35:38 2017 -0500
Tests: In CTestTest2 configure KWSys encoding to match CMake
During configuration of KWSys by CMake we write UTF-8 content
to a string used by KWSys tests. Tell KWSys to interpret it
as UTF-8 instead of the ANSI code page.
diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in
index 825b957..a9bbc52 100644
--- a/Tests/CTestTest2/test.cmake.in
+++ b/Tests/CTestTest2/test.cmake.in
@@ -34,6 +34,7 @@ CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
+KWSYS_ENCODING_DEFAULT_CODEPAGE:STRING=CP_UTF8
# This one is needed for testing advanced ctest features
CTEST_TEST_KWSYS:BOOL=ON
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestTest2/test.cmake.in | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list