Merge lp:~allanlesage/xpathselect/cmake-extras-coverage-reporting into lp:xpathselect

[Allan LeSage]

Simplify coverage reporting.

Simplify coverage reporting. This won't fail the build but if you have cmake-extras installed you'll get a 'make coverage' target which generates html and xml output.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~allanlesage/xpathselect/cmake-extras-coverage-reporting/+merge/227997/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/xpathselect-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-utopic-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/xpathselect-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

Does this need an additional build-dep? I don't know what 'cmake-extras'
is....

On Thu, Jul 24, 2014 at 9:45 AM, PS Jenkins bot <
<email address hidden>> wrote:

> Review: Needs Fixing continuous-integration
>
> FAILED: Continuous integration, rev:44
> No commit message was specified in the merge proposal. Click on the
> following link and set the commit message (if you want a jenkins rebuild
> you need to trigger it yourself):
>
> https://code.launchpad.net/~allanlesage/xpathselect/cmake-extras-coverage-reporting/+merge/227997/+edit-commit-message
>
> http://jenkins.qa.ubuntu.com/job/xpathselect-ci/9/
> Executed test runs:
> SUCCESS:
> http://jenkins.qa.ubuntu.com/job/xpathselect-utopic-amd64-ci/2
> SUCCESS:
> http://jenkins.qa.ubuntu.com/job/xpathselect-utopic-armhf-ci/2
> SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-utopic-i386-ci/2
>
> Click here to trigger a rebuild:
> http://s-jenkins.ubuntu-ci:8080/job/xpathselect-ci/9/rebuild
>
> --
>
> https://code.launchpad.net/~allanlesage/xpathselect/cmake-extras-coverage-reporting/+merge/227997
> You are requested to review the proposed merge of
> lp:~allanlesage/xpathselect/cmake-extras-coverage-reporting into
> lp:xpathselect.
>

--
Thomi Richards
<email address hidden>

[Allan LeSage (allanlesage)]

If you have cmake-extras, lcov, and gcovr installed, you'll get a coverage build target. If you don't, the build won't fail.

$ cmake .. -Denable_coverage=1
$ make
$ make test
$ make coverage

Unmerged revisions

44. By Allan LeSage on 2014-07-23

Add our cmake-extras coverage macro.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-13 05:11:21 +0000
+++ CMakeLists.txt	2014-07-23 21:28:07 +0000
@@ -8,16 +8,15 @@
 
 set (VERSION 1.4)
 
-if(CMAKE_BUILD_TYPE STREQUAL "coverage")
-  message("Building for coverage")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" )
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" )
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage" )
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage" )
-endif(CMAKE_BUILD_TYPE STREQUAL "coverage")
-
 INCLUDE(FindPkgConfig)
 
 add_subdirectory(lib)
 add_subdirectory(test)
 
+# cmake .. -Denable_coverage=1
+option(enable_coverage "Add coverage targets.")
+if(enable_coverage)
+  # NOTE this comes from cmake-extras
+  include(EnableCoverageReport)
+  ENABLE_COVERAGE_REPORT(TARGETS xpathselect FILTER /usr/include ${CMAKE_SOURCE_DIR}/test/* ${CMAKE_BINARY_DIR}/*)
+endif()