[Cmake-commits] CMake branch, next, updated. v3.2.1-1462-gc56158b

[Nils Gladitz]

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  c56158b2c4aa16e9cefe30efab1ad467f4e36260 (commit)
       via  560edb1157a99f9091aab11f04a84f5e8352073e (commit)
      from  3664e7ee98b13a3acca13ee8b163a6d36454ec7b (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=c56158b2c4aa16e9cefe30efab1ad467f4e36260
commit c56158b2c4aa16e9cefe30efab1ad467f4e36260
Merge: 3664e7e 560edb1
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Apr 4 06:24:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 4 06:24:08 2015 -0400

    Merge topic 'gcov-module-coverage-exclude' into next
    
    560edb11 CTestCoverageCollectGCOV: Fix unicode path source file path handling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=560edb1157a99f9091aab11f04a84f5e8352073e
commit 560edb1157a99f9091aab11f04a84f5e8352073e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Apr 4 12:23:06 2015 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Apr 4 12:23:06 2015 +0200

    CTestCoverageCollectGCOV: Fix unicode path source file path handling

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index db86751..8659a69 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -152,7 +152,7 @@ function(ctest_coverage_collect_gcov)
 
   set(gcov_files)
   foreach(gcov_file ${unfiltered_gcov_files})
-    file(STRINGS ${binary_dir}/${gcov_file} first_line LIMIT_COUNT 1)
+    file(STRINGS ${binary_dir}/${gcov_file} first_line LIMIT_COUNT 1 ENCODING UTF-8)
 
     set(is_excluded false)
     if(first_line MATCHES "^        -:    0:Source:(.*)$")
diff --git a/Tests/CTestCoverageCollectGCOV/fakegcov.cmake b/Tests/CTestCoverageCollectGCOV/fakegcov.cmake
index c7b563f..b0c3a9b 100644
--- a/Tests/CTestCoverageCollectGCOV/fakegcov.cmake
+++ b/Tests/CTestCoverageCollectGCOV/fakegcov.cmake
@@ -7,7 +7,7 @@ endforeach()
 get_filename_component(gcda_name ${gcda_file} NAME)
 string(REPLACE ".gcda" ".gcov" gcov_name "${gcda_name}")
 
-file(STRINGS "${gcda_file}" source_file LIMIT_COUNT 1)
+file(STRINGS "${gcda_file}" source_file LIMIT_COUNT 1 ENCODING UTF-8)
 
 file(WRITE "${CMAKE_SOURCE_DIR}/${gcov_name}"
   "        -:    0:Source:${source_file}"

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake        |    2 +-
 Tests/CTestCoverageCollectGCOV/fakegcov.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake