Merge lp:~brandontschaefer/compiz/grid-plugin-fix into lp:compiz/0.9.9

Proposed by Brandon Schaefer
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3431
Merged at revision: 3431
Proposed branch: lp:~brandontschaefer/compiz/grid-plugin-fix
Merge into: lp:compiz/0.9.9
Diff against target: 11 lines (+0/-2)
1 file modified
plugins/grid/CMakeLists.txt (+0/-2)
To merge this branch: bzr merge lp:~brandontschaefer/compiz/grid-plugin-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Daniel van Vugt Approve
Review via email: mp+130021@code.launchpad.net

Commit message

Fix grid build failure (LP: #1067577)

Description of the change

Compiz fails to build the grid plugin due to 2 different standards being used. The grid plugin uses std=c++0x, while the compiz core does not. The problem being explicit instantiation of templates which breaks the ABI for any plugin that uses the std=c++0x standard.

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Works for me (still). Tested gcc and clang.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/grid/CMakeLists.txt'
2--- plugins/grid/CMakeLists.txt 2012-09-25 01:15:36 +0000
3+++ plugins/grid/CMakeLists.txt 2012-10-17 03:03:20 +0000
4@@ -2,8 +2,6 @@
5
6 include (CompizPlugin)
7
8-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
9-
10 include_directories (src/grabhandler/include)
11 link_directories (${CMAKE_CURRENT_BINARY_DIR}/src/grabhandler)
12

Subscribers

People subscribed via source and target branches