Merge lp://staging/~saviq/unity-system-compositor/use-cmake-extras into lp://staging/unity-system-compositor

Proposed by Michał Sawicz
Status: Work in progress
Proposed branch: lp://staging/~saviq/unity-system-compositor/use-cmake-extras
Merge into: lp://staging/unity-system-compositor
Diff against target: 98 lines (+3/-59)
4 files modified
CMakeLists.txt (+1/-2)
cmake/FindGtest.cmake (+0/-53)
debian/control (+1/-0)
tests/unit-tests/CMakeLists.txt (+1/-4)
To merge this branch: bzr merge lp://staging/~saviq/unity-system-compositor/use-cmake-extras
Reviewer Review Type Date Requested Status
Alan Griffiths Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Robert Carr (community) Approve
Review via email: mp+243770@code.staging.launchpad.net

Commit message

Use FindGMock from cmake-extras_0.3, also wrap-and-sort debian/control

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Carr (robertcarr) wrote :

+1

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Basicly sound, but out of date:

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing
Revision history for this message
Michał Sawicz (saviq) wrote :

W dniu 03.06.2015 o 19:02, Alan Griffiths pisze:
> Basicly sound, but out of date:
>
> Text conflict in debian/control
> 1 conflicts encountered.

Well, "Proposed [...] on 2014-12-05" ;)

Resolved.

191. By Michał Sawicz

Merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Mmm. No, there are linker errors.

review: Needs Fixing

Unmerged revisions

191. By Michał Sawicz

Merge trunk

190. By Michał Sawicz

Use FindGtest from cmake-extras_0.3, also wrap-and-sort debian/control

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