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 e562910dcba4de9de3fe5138d19609092917c881 (commit)
via 197a026cfb650939a5c1054783fbe0e83802c9e6 (commit)
from 70f065d1cbaff76b4e55b4fc6f778cc7d0b37775 (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=e562910dcba4de9de3fe5138d19609092917c881
commit e562910dcba4de9de3fe5138d19609092917c881
Merge: 70f065d 197a026
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Oct 27 19:56:10 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 27 19:56:10 2014 -0400
Merge topic 'compiler-include-encoding' into next
197a026c Fix failing StringFileTest when using unicode characters.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=197a026cfb650939a5c1054783fbe0e83802c9e6
commit 197a026cfb650939a5c1054783fbe0e83802c9e6
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Oct 27 17:53:31 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Oct 27 17:55:15 2014 -0600
Fix failing StringFileTest when using unicode characters.
Some compilers (e.g. MSVC) can have a different encoding than the build
tool.
Changing the test to not use a full include path written to a header file
by cmake.
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index e6c6152..faf3bc9 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -189,7 +189,7 @@ string(CONFIGURE "${infile}" infile+-/out @ONLY)
set(infile "${infile+-/out}")
# Write include file to a file
-string(REGEX REPLACE "includefile" "${file}" outfile "${infile}")
+string(REGEX REPLACE "includefile" "Includes/Values.h" outfile "${infile}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/OutputFile.h-tmp" "${outfile}")
file(RENAME "${CMAKE_CURRENT_BINARY_DIR}/OutputFile.h-tmp"
"${CMAKE_CURRENT_BINARY_DIR}/OutputFile.h")
-----------------------------------------------------------------------
Summary of changes:
Tests/StringFileTest/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
