Compiz Core

Merge lp:~smspillaz/compiz-core/compiz-core.install-link-fixes into lp:compiz-core/0.9.5

  1. compiz-core.install-link-fixes
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 2941
Proposed branch: lp:~smspillaz/compiz-core/compiz-core.install-link-fixes
Merge into: lp:compiz-core/0.9.5
Diff against target: 40 lines (+8/-2)
2 files modified
cmake/CompizPlugin.cmake (+1/-0)
src/CMakeLists.txt (+7/-2)
To merge this branch: bzr merge lp:~smspillaz/compiz-core/compiz-core.install-link-fixes
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+89549@code.launchpad.net

Description of the change

Actually install the compiz binary and link plugins to compiz_core

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizPlugin.cmake'
2--- cmake/CompizPlugin.cmake 2012-01-12 06:48:58 +0000
3+++ cmake/CompizPlugin.cmake 2012-01-21 17:18:25 +0000
4@@ -404,6 +404,7 @@
5 ${${_PLUGIN}_PKG_LIBRARIES}
6 ${${_PLUGIN}_LIBRARIES}
7 ${${_PLUGIN}_MOD_LIBRARIES}
8+ compiz_core
9 )
10
11 install (
12
13=== modified file 'src/CMakeLists.txt'
14--- src/CMakeLists.txt 2012-01-20 15:42:52 +0000
15+++ src/CMakeLists.txt 2012-01-21 17:18:25 +0000
16@@ -77,6 +77,7 @@
17 link_directories (
18 ${COMPIZ_LINK_DIRS}
19 ${CORE_MOD_LIBRARY_DIRS}
20+ ${libdir}
21 )
22
23 add_library (compiz_core SHARED
24@@ -144,10 +145,14 @@
25
26 install (
27 TARGETS compiz_core
28+ LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
29+)
30+
31+install (
32+ TARGETS compiz
33 RUNTIME DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
34- LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
35- ARCHIVE DESTINATION ${COMPIZ_DESTDIR}${libdir}
36 )
37+
38 add_subdirectory(tests)
39
40 enable_coverage_report( TARGETS compiz )

Subscribers

People subscribed via source and target branches