Compiz

Merge lp:~sil2100/compiz/fix-pkgconfig into lp:compiz/0.9.8

  1. fix-pkgconfig
  2. Merge into 0.9.8
Proposed by Łukasz Zemczak on 2012-09-05
Status: Merged
Approved by: Sebastien Bacher on 2012-09-05
Approved revision: 3339
Merged at revision: 3339
Proposed branch: lp:~sil2100/compiz/fix-pkgconfig
Merge into: lp: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:~sil2100/compiz/fix-pkgconfig
Reviewer Review Type Date Requested Status
Compiz Maintainers 2012-09-05 Pending
Review via email: mp+122946@code.launchpad.net

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.
Sebastien Bacher (seb128) wrote :

looks good to me, thanks for tracking it down, the unity mergers have been down all day due to that

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-09-04 15:33:44 +0000
3+++ CMakeLists.txt 2012-09-05 20:59:27 +0000
4@@ -110,12 +110,8 @@
5 compiz_pkg_check_modules (COMPIZ REQUIRED ${COMPIZ_REQUIRES})
6 compiz_pkg_check_modules (LIBDECORATION REQUIRED ${DECORATION_REQUIRES})
7
8-list (APPEND COMPIZ_LIBRARIES ${Boost_LIBRARIES})
9-
10 include (CompizDefaults)
11
12-set (COMPIZ_CFLAGS "${COMPIZ_CFLAGS} -I${Boost_INCLUDE_DIR}")
13-
14 set (_compiz_package_string "Compiz ${VERSION}")
15 set (_compiz_package "Compiz")
16

Subscribers

People subscribed via source and target branches