libusermetrics

Merge lp://staging/~pete-woods/libusermetrics/cmake-extras-compatibility into lp://staging/libusermetrics

  1. cmake-extras-compatibility
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 240
Merged at revision: 234
Proposed branch: lp://staging/~pete-woods/libusermetrics/cmake-extras-compatibility
Merge into: lp://staging/libusermetrics
Diff against target: 2529 lines (+97/-2221)
19 files modified
.bzrignore (+2/-0)
CMakeLists.txt (+30/-10)
cmake/COPYING-CMAKE-SCRIPTS (+0/-22)
cmake/Coverage.cmake (+0/-37)
cmake/Doxyfile.in (+0/-1891)
cmake/FindGMock.cmake (+0/-10)
cmake/FindValgrind.cmake (+0/-34)
cmake/UseDoxygen.cmake (+0/-154)
cmake/UseGSettings.cmake (+0/-29)
data/CMakeLists.txt (+1/-1)
debian/control (+4/-3)
debian/rules (+1/-1)
doc/CMakeLists.txt (+26/-0)
po/CMakeLists.txt (+9/-6)
tests/CMakeLists.txt (+1/-3)
tests/unit/libusermetricsinput/CMakeLists.txt (+1/-1)
tests/unit/libusermetricsoutput/CMakeLists.txt (+1/-1)
tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp (+20/-17)
tests/unit/usermetricsservice/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~pete-woods/libusermetrics/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
James Henstridge Needs Information
Review via email: mp+312702@code.staging.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Compatibility with unversioned cmake-extras modules

To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

Does the coverage report still work with this change?

The cmake/Coverage.cmake file looks like it will unconditionally add the coverage rules if CMAKE_BUILD_TYPE=coverage once it is included.

With find_package(CoverageReport), it is also necessary to call enable_coverage_report(), telling it about the coverage targets, test targets, and directories to exclude from the report.

review: Needs Information
Revision history for this message
Michi Henning (michihenning) wrote :

I did run test builds of thumbnailer, persistent-cache-cpp, mediascanner2, and storage-framework with Pete's PPA. Everything seemed to work fine. I didn't check what happens when you build without coverage as the build type though.

Revision history for this message
Pete Woods (pete-woods) wrote :

I've fixed the coverage report in this MR, and also the other MRs.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: