[Cmake-commits] CMake branch, next, updated. v2.8.3-1603-gb4c5392

[David Cole]

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  b4c53924a9ad2ca4a2e5546a6bdd479228cf8e2f (commit)
       via  6e02a3b2bf43f4785bb21eb1cf8bbc26ac1abc12 (commit)
      from  1e305de012b9c92f9121c4a875254474a443f648 (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=b4c53924a9ad2ca4a2e5546a6bdd479228cf8e2f
commit b4c53924a9ad2ca4a2e5546a6bdd479228cf8e2f
Merge: 1e305de 6e02a3b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 9 16:09:38 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 9 16:09:38 2011 -0500

    Merge topic 'fix-11717-gcov-same-file-name' into next
    
    6e02a3b CTest: Use the gcov --preserve-paths flag (#11717)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e02a3b2bf43f4785bb21eb1cf8bbc26ac1abc12
commit 6e02a3b2bf43f4785bb21eb1cf8bbc26ac1abc12
Author:     Marco Craveiro <marco.craveiro at gmail.com>
AuthorDate: Wed Jan 12 22:43:24 2011 +0000
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Feb 9 16:04:15 2011 -0500

    CTest: Use the gcov --preserve-paths flag (#11717)
    
    To avoid name clashes.
    
    Before this commit, name clashes can occur when invoking gcov on a
    project that uses the same file name in different directories. The
    --preserve-paths flag ensures all file names have a complete path,
    avoiding name clashes.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 6863adc..005651f 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -825,7 +825,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     // Call gcov to get coverage data for this *.gcda file:
     //
     std::string fileDir = cmSystemTools::GetFilenamePath(it->c_str());
-    std::string command = "\"" + gcovCommand + "\" -l -o \"" + fileDir
+    std::string command = "\"" + gcovCommand + "\" -l -p -o \"" + fileDir
       + "\" \"" + *it + "\"";
 
     cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake