lp:~compiz-team/compiz/build-libcompizconfig

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.8 at revision 3211

Daniel van Vugt: Approve on 2012-05-22

Compiz Maintainers: Pending requested 2012-05-22

Diff: 745 lines (+162/-156)

15 files modified

CMakeLists.txt (+1/-3)
cmake/base.cmake (+17/-0)
compizconfig/CMakeLists.txt (+4/-8)
compizconfig/libcompizconfig/CMakeLists.txt (+9/-68)
compizconfig/libcompizconfig/backend/src/ini.c (+16/-7)
compizconfig/libcompizconfig/libcompizconfig_internal.pc.in (+12/-0)
compizconfig/libcompizconfig/plugin/CMakeLists.txt (+0/-6)
compizconfig/libcompizconfig/plugin/ccp.xml (+0/-7)
compizconfig/libcompizconfig/src/CMakeLists.txt (+0/-1)
compizconfig/libcompizconfig/src/compiz.cpp (+44/-20)
compizconfig/libcompizconfig/src/config.c (+9/-3)
compizconfig/libcompizconfig/src/ini.c (+13/-5)
compizconfig/libcompizconfig/src/main.c (+36/-17)
plugins/ccp/CMakeLists.txt (+1/-7)
plugins/ccp/src/ccp.h (+0/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3210. By Daniel van Vugt on 2012-05-22

Fix a couple of build failures

3209. By Sam Spilsbury on 2012-05-21

Remove useless header

3208. By Sam Spilsbury on 2012-05-21

Move check for compizconfig cmake macro to the same place we check for compiz

3207. By Sam Spilsbury on 2012-05-21

Remove useless uninstall rule

3206. By Sam Spilsbury on 2012-05-21

Also configure libcompizconfig_internal.pc.in

3205. By Sam Spilsbury on 2012-05-21

Add missing file

3204. By Sam Spilsbury on 2012-05-21

Merge branch to enable libcompizconfig for building

3203. By Sam Spilsbury on 2012-05-21

Split out CompRegion into separate static lib

Linking the wall plugin to libcompiz_core could cause libcompiz_core to be rebuilt with the wrong cflags. In reality, it only depends on the region calculation functions, so link internally with libcompiz_region and split region functionality out into libcompiz_region

Also fixes a small header issue with the grid plugin

Merge lp:~compiz-team/compiz/compiz.separate-region-fix-random-build-fails into lp:compiz/0.9.8

3202. By Daniel van Vugt on 2012-05-18

Fix all compiler warnings and turn on -Werror again (treat warnings as errors)

3201. By Daniel van Vugt on 2012-05-17

Don't autmatically build compizconfig right now. It breaks cmake globally
and causes many different build failures, even in core components.