Merge lp:~vanvugt/compiz-plugins-main/fix-1084386 into lp:compiz-plugins-main

Proposed by Daniel van Vugt on 2012-11-29
Status: Merged
Approved by: Brandon Schaefer on 2012-11-29
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~vanvugt/compiz-plugins-main/fix-1084386
Merge into: lp:compiz-plugins-main
Diff against target: 12 lines (+1/-1)
1 file modified
wall/src/offset_movement/tests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/compiz-plugins-main/fix-1084386
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2012-11-29 Approve on 2012-11-29
Review via email: mp+136841@code.launchpad.net

Commit message

Quick fix for build failure (can't find compiz_core during linking).
(LP: #1084386)

This fix is intentionally self-contained in compiz-plugins-main. A proper
fix to core is in progress in bug 1084162.

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wall/src/offset_movement/tests/CMakeLists.txt'
2--- wall/src/offset_movement/tests/CMakeLists.txt 2012-05-09 01:57:02 +0000
3+++ wall/src/offset_movement/tests/CMakeLists.txt 2012-11-29 04:09:24 +0000
4@@ -42,7 +42,7 @@
5 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
6 include_directories (${COMPIZ_INCLUDE_DIRS})
7
8-link_directories (${COMPIZ_LIBRARY_DIRS})
9+link_directories (${COMPIZ_LIBRARY_DIRS} ${COMPIZ_LIBDIR})
10
11 add_executable (compiz_test_wall_offset_movement
12 ${CMAKE_CURRENT_SOURCE_DIR}/test-wall-offset-movement.cpp)

Subscribers

People subscribed via source and target branches