Compiz Core

Merge lp:~vanvugt/compiz-core/fix-922450 into lp:compiz-core/0.9.5

  1. fix-922450
  2. Merge into 0.9.5
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: 2966
Merged at revision: 2967
Proposed branch: lp:~vanvugt/compiz-core/fix-922450
Merge into: lp:compiz-core/0.9.5
Diff against target: 41 lines (+0/-20)
2 files modified
plugins/place/src/constrain-to-workarea/CMakeLists.txt (+0/-10)
plugins/place/src/screen-size-change/CMakeLists.txt (+0/-10)
To merge this branch: bzr merge lp:~vanvugt/compiz-core/fix-922450
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+90378@code.launchpad.net

Description of the change

Don't install unwanted archives that are already in libplace.so (LP: #922450)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/place/src/constrain-to-workarea/CMakeLists.txt'
2--- plugins/place/src/constrain-to-workarea/CMakeLists.txt 2012-01-23 11:54:43 +0000
3+++ plugins/place/src/constrain-to-workarea/CMakeLists.txt 2012-01-27 06:53:24 +0000
4@@ -55,16 +55,6 @@
5 PUBLIC_HEADER "${PUBLIC_HEADERS}"
6 )
7
8-INSTALL(
9- TARGETS compiz_place_constrain_to_workarea
10- RUNTIME DESTINATION bin
11- LIBRARY DESTINATION lib
12- ARCHIVE DESTINATION lib
13- PUBLIC_HEADER DESTINATION include/compiz/core
14-)
15-
16-
17-
18 TARGET_LINK_LIBRARIES(
19 compiz_place_constrain_to_workarea
20 compiz_rect
21
22=== modified file 'plugins/place/src/screen-size-change/CMakeLists.txt'
23--- plugins/place/src/screen-size-change/CMakeLists.txt 2012-01-23 11:54:43 +0000
24+++ plugins/place/src/screen-size-change/CMakeLists.txt 2012-01-27 06:53:24 +0000
25@@ -55,16 +55,6 @@
26 PUBLIC_HEADER "${PUBLIC_HEADERS}"
27 )
28
29-INSTALL(
30- TARGETS compiz_place_screen_size_change
31- RUNTIME DESTINATION bin
32- LIBRARY DESTINATION lib
33- ARCHIVE DESTINATION lib
34- PUBLIC_HEADER DESTINATION include/compiz/core
35-)
36-
37-
38-
39 TARGET_LINK_LIBRARIES(
40 compiz_place_screen_size_change
41 compiz_place_constrain_to_workarea

Subscribers

People subscribed via source and target branches