Merge lp://qastaging/~sil2100/compiz/fix-pkgconfig into lp://qastaging/compiz/0.9.8
Proposed by
Łukasz Zemczak
| Status: | Merged |
|---|---|
| Approved by: | Sebastien Bacher |
| Approved revision: | 3339 |
| Merged at revision: | 3339 |
| Proposed branch: | lp://qastaging/~sil2100/compiz/fix-pkgconfig |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
15 lines (+0/-4) 1 file modified
CMakeLists.txt (+0/-4) |
| To merge this branch: | bzr merge lp://qastaging/~sil2100/compiz/fix-pkgconfig |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
Commit message
Remove leftover boost CMake magic, which was in fact breaking the compiz.pc file.
Description of the change
This branch essentially fixes the unity build problems with compiz trunk.
The problem:
Unity fails building because of malformed CFLAGS during build. This, in fact, is caused by compiz.pc being essentially broken. It got broken after removing boost serialization.
The fix:
Sam forgot removing 2 CMakeLists.txt lines related to boost - these, since were empty, caused compiz.pc being generated invalid.
Tests:
None.
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
looks good to me, thanks for tracking it down, the unity mergers have been down all day due to that