Compiz Core

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

  1. fix-919948.2
  2. Merge into 0.9.5
Proposed by Daniel van Vugt
Status: Superseded
Proposed branch: lp:~vanvugt/compiz-core/fix-919948.2
Merge into: lp:compiz-core/0.9.5
Diff against target: 225 lines (+13/-89)
12 files modified
cmake/CompizDefaults.cmake (+2/-1)
include/core/CMakeLists.txt (+1/-4)
src/logmessage/CMakeLists.txt (+1/-7)
src/pluginclasshandler/CMakeLists.txt (+1/-7)
src/point/CMakeLists.txt (+1/-9)
src/rect/CMakeLists.txt (+1/-9)
src/string/CMakeLists.txt (+1/-7)
src/timer/CMakeLists.txt (+1/-9)
src/window/constrainment/CMakeLists.txt (+1/-9)
src/window/extents/CMakeLists.txt (+1/-9)
src/window/geometry-saver/CMakeLists.txt (+1/-9)
src/window/geometry/CMakeLists.txt (+1/-9)
To merge this branch: bzr merge lp:~vanvugt/compiz-core/fix-919948.2
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+89637@code.launchpad.net

This proposal has been superseded by a proposal from 2012-01-23.

Description of the change

Don't install lib/libcompiz_*.a because they're already installed inside
lib/libcompiz_core.so (LP: #919948)

We do however want to install the headers. Unfortunately CMake gives you
no way to say install(TARGETS something ARCHIVE DESTINATION null) and it
always wants to install the archive. So we work around this problem with
CMake by removing the archives' INSTALL rules and simply installing the
required headers as part of compiz_core: src/CMakeLists.txt.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

It should be possible to just install the headers, see core/include/CMakeLists.txt

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Hmm, yes. That might work if you remove "TARGETS ..." from the install rules and install the headers as a list of files instead of properties of a target.

If you keep "TARGETS ..." in the install rules then you can't stop CMake from installing the archives (*.a). Either that or it gives you an error saying you forgot to install your archives/libraries.

lp:~vanvugt/compiz-core/fix-919948.2 updated
2934. By Daniel van Vugt

A more elegant fix for LP: #919948. Just install the headers explicitly.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizDefaults.cmake'
2--- cmake/CompizDefaults.cmake 2011-07-27 16:13:28 +0000
3+++ cmake/CompizDefaults.cmake 2012-01-23 10:46:22 +0000
4@@ -1,5 +1,6 @@
5 set (COMPIZ_PREFIX ${CMAKE_INSTALL_PREFIX})
6 set (COMPIZ_INCLUDEDIR ${includedir})
7+set (COMPIZ_CORE_INCLUDE_DIR ${includedir}/compiz/core)
8 set (COMPIZ_LIBDIR ${libdir})
9
10 list (APPEND COMPIZ_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/include)
11@@ -13,4 +14,4 @@
12
13 set (COMPIZ_PLUGIN_INSTALL_TYPE "package")
14
15-set (_COMPIZ_INTERNAL 1)
16\ No newline at end of file
17+set (_COMPIZ_INTERNAL 1)
18
19=== modified file 'include/core/CMakeLists.txt'
20--- include/core/CMakeLists.txt 2012-01-20 15:13:40 +0000
21+++ include/core/CMakeLists.txt 2012-01-23 10:46:22 +0000
22@@ -24,7 +24,4 @@
23 deg2rad.h
24 )
25
26-install (
27- FILES ${_headers}
28- DESTINATION ${COMPIZ_DESTDIR}${includedir}/compiz/core
29-)
30+install (FILES ${_headers} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
31
32=== modified file 'src/logmessage/CMakeLists.txt'
33--- src/logmessage/CMakeLists.txt 2012-01-16 07:29:26 +0000
34+++ src/logmessage/CMakeLists.txt 2012-01-23 10:46:22 +0000
35@@ -28,10 +28,4 @@
36 PUBLIC_HEADER "${PUBLIC_HEADERS}"
37 )
38
39-INSTALL(
40- TARGETS compiz_logmessage
41- RUNTIME DESTINATION bin
42- LIBRARY DESTINATION lib
43- ARCHIVE DESTINATION lib
44- PUBLIC_HEADER DESTINATION include/compiz/core
45-)
46+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
47
48=== modified file 'src/pluginclasshandler/CMakeLists.txt'
49--- src/pluginclasshandler/CMakeLists.txt 2012-01-16 07:29:26 +0000
50+++ src/pluginclasshandler/CMakeLists.txt 2012-01-23 10:46:22 +0000
51@@ -42,10 +42,4 @@
52 PUBLIC_HEADER "${PUBLIC_HEADERS}"
53 )
54
55-INSTALL(
56- TARGETS compiz_pluginclasshandler
57- RUNTIME DESTINATION bin
58- LIBRARY DESTINATION lib
59- ARCHIVE DESTINATION lib
60- PUBLIC_HEADER DESTINATION include/compiz/core
61-)
62+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
63
64=== modified file 'src/point/CMakeLists.txt'
65--- src/point/CMakeLists.txt 2012-01-19 19:16:27 +0000
66+++ src/point/CMakeLists.txt 2012-01-23 10:46:22 +0000
67@@ -50,15 +50,7 @@
68 PUBLIC_HEADER "${PUBLIC_HEADERS}"
69 )
70
71-INSTALL(
72- TARGETS compiz_point
73- RUNTIME DESTINATION bin
74- LIBRARY DESTINATION lib
75- ARCHIVE DESTINATION lib
76- PUBLIC_HEADER DESTINATION include/compiz
77-)
78-
79-
80+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
81
82 TARGET_LINK_LIBRARIES(
83 compiz_point
84
85=== modified file 'src/rect/CMakeLists.txt'
86--- src/rect/CMakeLists.txt 2012-01-19 19:32:29 +0000
87+++ src/rect/CMakeLists.txt 2012-01-23 10:46:22 +0000
88@@ -48,15 +48,7 @@
89 PUBLIC_HEADER "${PUBLIC_HEADERS}"
90 )
91
92-INSTALL(
93- TARGETS compiz_rect
94- RUNTIME DESTINATION bin
95- LIBRARY DESTINATION lib
96- ARCHIVE DESTINATION lib
97- PUBLIC_HEADER DESTINATION include/compiz
98-)
99-
100-
101+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
102
103 TARGET_LINK_LIBRARIES(
104 compiz_rect
105
106=== modified file 'src/string/CMakeLists.txt'
107--- src/string/CMakeLists.txt 2011-12-19 07:06:22 +0000
108+++ src/string/CMakeLists.txt 2012-01-23 10:46:22 +0000
109@@ -26,10 +26,4 @@
110 PUBLIC_HEADER "${PUBLIC_HEADERS}"
111 )
112
113-INSTALL(
114- TARGETS compiz_string
115- RUNTIME DESTINATION bin
116- LIBRARY DESTINATION lib
117- ARCHIVE DESTINATION lib
118- PUBLIC_HEADER DESTINATION include/compiz
119-)
120+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
121
122=== modified file 'src/timer/CMakeLists.txt'
123--- src/timer/CMakeLists.txt 2012-01-16 07:29:26 +0000
124+++ src/timer/CMakeLists.txt 2012-01-23 10:46:22 +0000
125@@ -53,15 +53,7 @@
126 PUBLIC_HEADER "${PUBLIC_HEADERS}"
127 )
128
129-INSTALL(
130- TARGETS compiz_timer
131- RUNTIME DESTINATION bin
132- LIBRARY DESTINATION lib
133- ARCHIVE DESTINATION lib
134- PUBLIC_HEADER DESTINATION include/compiz/core
135-)
136-
137-
138+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
139
140 TARGET_LINK_LIBRARIES(
141 compiz_timer
142
143=== modified file 'src/window/constrainment/CMakeLists.txt'
144--- src/window/constrainment/CMakeLists.txt 2012-01-22 09:34:55 +0000
145+++ src/window/constrainment/CMakeLists.txt 2012-01-23 10:46:22 +0000
146@@ -51,15 +51,7 @@
147 PUBLIC_HEADER "${PUBLIC_HEADERS}"
148 )
149
150-INSTALL(
151- TARGETS compiz_window_constrainment
152- RUNTIME DESTINATION bin
153- LIBRARY DESTINATION lib
154- ARCHIVE DESTINATION lib
155- PUBLIC_HEADER DESTINATION include/compiz/core
156-)
157-
158-
159+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
160
161 TARGET_LINK_LIBRARIES(
162 compiz_window_constrainment
163
164=== modified file 'src/window/extents/CMakeLists.txt'
165--- src/window/extents/CMakeLists.txt 2012-01-22 09:34:55 +0000
166+++ src/window/extents/CMakeLists.txt 2012-01-23 10:46:22 +0000
167@@ -49,15 +49,7 @@
168 PUBLIC_HEADER "${PUBLIC_HEADERS}"
169 )
170
171-INSTALL(
172- TARGETS compiz_window_extents
173- RUNTIME DESTINATION bin
174- LIBRARY DESTINATION lib
175- ARCHIVE DESTINATION lib
176- PUBLIC_HEADER DESTINATION include/compiz/core
177-)
178-
179-
180+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
181
182 TARGET_LINK_LIBRARIES(
183 compiz_window_extents
184
185=== modified file 'src/window/geometry-saver/CMakeLists.txt'
186--- src/window/geometry-saver/CMakeLists.txt 2012-01-22 09:34:55 +0000
187+++ src/window/geometry-saver/CMakeLists.txt 2012-01-23 10:46:22 +0000
188@@ -51,15 +51,7 @@
189 PUBLIC_HEADER "${PUBLIC_HEADERS}"
190 )
191
192-INSTALL(
193- TARGETS compiz_window_geometry_saver
194- RUNTIME DESTINATION bin
195- LIBRARY DESTINATION lib
196- ARCHIVE DESTINATION lib
197- PUBLIC_HEADER DESTINATION include/compiz/core
198-)
199-
200-
201+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
202
203 TARGET_LINK_LIBRARIES (
204 compiz_window_geometry_saver
205
206=== modified file 'src/window/geometry/CMakeLists.txt'
207--- src/window/geometry/CMakeLists.txt 2012-01-22 09:34:55 +0000
208+++ src/window/geometry/CMakeLists.txt 2012-01-23 10:46:22 +0000
209@@ -49,15 +49,7 @@
210 PUBLIC_HEADER "${PUBLIC_HEADERS}"
211 )
212
213-INSTALL(
214- TARGETS compiz_window_geometry
215- RUNTIME DESTINATION bin
216- LIBRARY DESTINATION lib
217- ARCHIVE DESTINATION lib
218- PUBLIC_HEADER DESTINATION include/compiz/core
219-)
220-
221-
222+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
223
224 TARGET_LINK_LIBRARIES(
225 compiz_window_geometry

Subscribers

People subscribed via source and target branches