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 01cd4d7da617553f3f0322c1ab6bb2304e652855 (commit) via dd8fccdc0f0e64c45f7098da497262454678721f (commit) from 569a549c79b6d8bd349727ad274881f15cdef7c2 (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=01cd4d7da617553f3f0322c1ab6bb2304e652855 commit 01cd4d7da617553f3f0322c1ab6bb2304e652855 Merge: 569a549 dd8fccd Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Fri Jan 30 11:37:51 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jan 30 11:37:51 2015 -0500 Merge topic 'clean_up_cdash_upload_files' into next dd8fccdc Make CTest GCOV_EXTRA_OPTIONS work like CoverageExtraFlags. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd8fccdc0f0e64c45f7098da497262454678721f commit dd8fccdc0f0e64c45f7098da497262454678721f Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Fri Jan 30 11:34:16 2015 -0500 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Fri Jan 30 11:34:16 2015 -0500 Make CTest GCOV_EXTRA_OPTIONS work like CoverageExtraFlags. In the existing gcov code, if you set CTEST_COVERAGE_EXTRA_FLAGS, they get put on the command line before the -o. In this case we remove the -b and replace it with GCOV_EXTRA_OPTIONS. All other arguments remain the same. diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake index edb1466..08f0805 100644 --- a/Modules/CTestCoverageCollectGCOV.cmake +++ b/Modules/CTestCoverageCollectGCOV.cmake @@ -44,7 +44,7 @@ # Specify extra options to be passed to gcov. By default # gcov is run like this gcov -b -o ${gcov_dir} ${gcda_file_path} # If GCOV_EXTRA_OPTIONS are specified, it will be run like this: -# ``gcov`` ${GCOV_EXTRA_OPTIONS} ${gcov_dir} ${gcda_file_path} +# ``gcov`` ${GCOV_EXTRA_OPTIONS} -o ${gcov_dir} ${gcda_file_path} #============================================================================= @@ -121,10 +121,10 @@ function(ctest_coverage_collect_gcov) # run gcov, this will produce the .gcov file in the current # working directory if(NOT DEFINED GCOV_GCOV_EXTRA_OPTIONS) - set(GCOV_GCOV_EXTRA_OPTIONS -b -o) + set(GCOV_GCOV_EXTRA_OPTIONS -b) endif() execute_process(COMMAND - ${gcov_command} ${GCOV_GCOV_EXTRA_OPTIONS} ${gcov_dir} ${gcda_file} + ${gcov_command} ${GCOV_GCOV_EXTRA_OPTIONS} -o ${gcov_dir} ${gcda_file} OUTPUT_VARIABLE out RESULT_VARIABLE res WORKING_DIRECTORY ${coverage_dir}) ----------------------------------------------------------------------- Summary of changes: Modules/CTestCoverageCollectGCOV.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits