Merge lp://qastaging/~gerboland/dee-qt/pkgconfig-fix into lp://qastaging/dee-qt/0.2

Proposed by Gerry Boland
Status: Merged
Approved by: Florian Boucault
Approved revision: 62
Merged at revision: 65
Proposed branch: lp://qastaging/~gerboland/dee-qt/pkgconfig-fix
Merge into: lp://qastaging/dee-qt/0.2
Diff against target: 41 lines (+12/-5)
2 files modified
CMakeLists.txt (+9/-2)
libqtdee.pc.in (+3/-3)
To merge this branch: bzr merge lp://qastaging/~gerboland/dee-qt/pkgconfig-fix
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
unity-2d-team Pending
Review via email: mp+91551@code.qastaging.launchpad.net

Description of the change

Generate pkgconfig file by cmake to point to correct install directories

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Yey!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/11/console reported an error when processing this lp:~gerboland/dee-qt/pkgconfig-fix branch.
Not merging it.

62. By Gerry Boland

Add correct prefixes to .pc file. Fix dpkg generation

Revision history for this message
Michal Hruby (mhr3) wrote :

Yep, now it actually works. :)

review: Approve

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