[Cmake-commits] CMake branch, next, updated. v3.1.1-2549-g0539d92

[Brad King]

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  0539d927c370a25e09b59e8fb90e382cae13a224 (commit)
       via  23fca4c96912b9a4bd012000f2af6851eb0b02a2 (commit)
      from  70fd484a81d55b9177b48f460f4d37d12089d0b2 (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=0539d927c370a25e09b59e8fb90e382cae13a224
commit 0539d927c370a25e09b59e8fb90e382cae13a224
Merge: 70fd484 23fca4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:38:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 10:38:20 2015 -0500

    Merge topic 'CTestCoverageCollectGCOV-refinements' into next
    
    23fca4c9 CTestCoverageCollectGCOV: Fix handling of international characters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23fca4c96912b9a4bd012000f2af6851eb0b02a2
commit 23fca4c96912b9a4bd012000f2af6851eb0b02a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:36:17 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 10:36:17 2015 -0500

    CTestCoverageCollectGCOV: Fix handling of international characters
    
    When loading the list of target support directories, read the file
    with UTF-8 encoding since that is what CMake writes into the file.
    This allows us to support international characters in the path to
    the build tree containing the target support directories.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index dd10e83..a607c52 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -90,7 +90,8 @@ function(ctest_coverage_collect_gcov)
   # look for gcda files in the target directories
   # could do a glob from the top of the binary tree but
   # this will be faster and only look where the files will be
-  file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs)
+  file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs
+       ENCODING UTF-8)
   foreach(target_dir ${target_dirs})
     file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${target_dir}/*.gcda")
     list(LENGTH gfiles len)

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake