Merge lp:~compiz-team/compiz/compiz.fix_1005009_googletest into lp:compiz/0.9.8
Proposed by
Sam Spilsbury
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | 3227 |
Merged at revision: | 3234 |
Proposed branch: | lp:~compiz-team/compiz/compiz.fix_1005009_googletest |
Merge into: | lp:compiz/0.9.8 |
Diff against target: |
197 lines (+98/-59) 6 files modified
plugins/grid/CMakeLists.txt (+6/-3) plugins/grid/src/grabhandler/CMakeLists.txt (+32/-0) plugins/grid/src/grabhandler/tests/CMakeLists.txt (+24/-0) plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp (+36/-0) plugins/grid/tests/grabhandler/CMakeLists.txt (+0/-9) plugins/grid/tests/grabhandler/test-grid-grab-handler.cpp (+0/-47) |
To merge this branch: | bzr merge lp:~compiz-team/compiz/compiz.fix_1005009_googletest |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
Compiz Maintainers | Pending | ||
Review via email: mp+107586@code.launchpad.net |
This proposal supersedes a proposal from 2012-05-26.
Description of the change
Move grid plugin to google test and don't depend on the plugin for the test
To post a comment you must log in.
Linking CXX shared library libgrid.so grid_grab_ handler grid/libgrid. so] Error 1 grid/CMakeFiles /grid.dir/ all] Error 2
/usr/bin/ld: cannot find -lcompiz_
collect2: ld returned 1 exit status
make[2]: *** [plugins/
make[1]: *** [plugins/
make[1]: *** Waiting for unfinished jobs....