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 e53a6242b570d8dbaeef136a5683f2138860f213 (commit)
via d4e0eee7698f4edda7f91bb7a8d0f5589feea7fd (commit)
from 01cd4d7da617553f3f0322c1ab6bb2304e652855 (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=e53a6242b570d8dbaeef136a5683f2138860f213
commit e53a6242b570d8dbaeef136a5683f2138860f213
Merge: 01cd4d7 d4e0eee
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 30 12:53:20 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jan 30 12:53:20 2015 -0500
Merge topic 'clean_up_cdash_upload_files' into next
d4e0eee7 fixup! Make CTest GCOV_EXTRA_OPTIONS work like CoverageExtraFlags.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4e0eee7698f4edda7f91bb7a8d0f5589feea7fd
commit d4e0eee7698f4edda7f91bb7a8d0f5589feea7fd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 30 12:47:02 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jan 30 12:47:02 2015 -0500
fixup! Make CTest GCOV_EXTRA_OPTIONS work like CoverageExtraFlags.
diff --git a/Modules/CTestCoverageCollectGCOV.cmake
b/Modules/CTestCoverageCollectGCOV.cmake
index 08f0805..037d3bc 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -19,6 +19,7 @@
# ctest_coverage_collect_gcov(TARBALL <tarfile>
# [SOURCE <source_dir>][BUILD <build_dir>]
# [GCOV_COMMAND <gcov_command>]
+# [GCOV_EXTRA_OPTIONS <extra_options>...]
# )
#
# Run gcov and package a tar file for CDash. The options are:
@@ -40,11 +41,11 @@
# Specify the full path to the ``gcov`` command on the machine.
# Default is the value of :variable:`CTEST_COVERAGE_COMMAND`.
#
-# ``GCOV_EXTRA_OPTIONS <extra options>``
+# ``GCOV_EXTRA_OPTIONS <extra_options>...``
# 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} -o ${gcov_dir} ${gcda_file_path}
+# gcov is run as ``gcov -b -o <gcov-dir> <file>.gcda``.
+# If GCOV_EXTRA_OPTIONS is specified, gcov will be run as
+# ``gcov <extra_options>... -o <gcov-dir> <file>.gcda``.
#=============================================================================
@@ -93,7 +94,7 @@ function(ctest_coverage_collect_gcov)
# this will be faster and only look where the files will be
file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs)
foreach(target_dir ${target_dirs})
- file(GLOB_RECURSE gfiles RELATIVE "${binary_dir}" ${target_dir}/*.gcda)
+ file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${target_dir}/*.gcda")
list(LENGTH gfiles len)
# if we have gcda files then also grab the labels file for that target
if(${len} GREATER 0)
-----------------------------------------------------------------------
Summary of changes:
Modules/CTestCoverageCollectGCOV.cmake | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
