Compiz Core

Merge lp:~kamstrup/compiz-core/plugin-build-dir-fix into lp:compiz-core

  1. plugin-build-dir-fix
  2. Merge into 0.9.7
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 2985
Merged at revision: 2985
Proposed branch: lp:~kamstrup/compiz-core/plugin-build-dir-fix
Merge into: lp:compiz-core
Diff against target: 12 lines (+1/-1)
1 file modified
src/plugin/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~kamstrup/compiz-core/plugin-build-dir-fix
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+91993@code.launchpad.net

Description of the change

Fix hardcoded ref to build/ dir and use ${compiz_BINARY_DIR} instead

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

Merge reverted in order to fix #929278: lp:compiz-core history was clobbered last night

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/CMakeLists.txt'
2--- src/plugin/CMakeLists.txt 2012-01-25 09:54:56 +0000
3+++ src/plugin/CMakeLists.txt 2012-02-08 09:01:18 +0000
4@@ -2,7 +2,7 @@
5 include (CompizCommon)
6
7 INCLUDE_DIRECTORIES(
8- ${compiz_SOURCE_DIR}/build/generated
9+ ${compiz_BINARY_DIR}/generated
10 ${compiz_SOURCE_DIR}/include
11
12 ${compiz_SOURCE_DIR}/src/timer/include

Subscribers

People subscribed via source and target branches