Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1171364 into lp:compiz/0.9.10

  1. compiz.fix_1171364
  2. Merge into 0.9.10
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1171364
Merge into: lp:compiz/0.9.10
Diff against target: 758 lines (+31/-123)
40 files modified
cmake/FindGoogleTest.cmake (+2/-1)
compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt (+0/-1)
compizconfig/integration/gnome/tests/CMakeLists.txt (+0/-1)
compizconfig/libcompizconfig/tests/CMakeLists.txt (+0/-9)
compizconfig/mocks/libcompizconfig/CMakeLists.txt (+1/-12)
gtk/window-decorator/tests/CMakeLists.txt (+0/-3)
plugins/composite/src/pixmapbinding/tests/CMakeLists.txt (+1/-3)
plugins/decor/src/clip-groups/tests/CMakeLists.txt (+1/-3)
plugins/decor/src/pixmap-requests/tests/CMakeLists.txt (+1/-3)
plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt (+0/-1)
plugins/expo/src/click_threshold/tests/CMakeLists.txt (+1/-3)
plugins/expo/src/wall_offset/tests/CMakeLists.txt (+1/-3)
plugins/grid/src/grabhandler/tests/CMakeLists.txt (+1/-3)
plugins/opengl/src/doublebuffer/tests/CMakeLists.txt (+1/-3)
plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt (+1/-3)
plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt (+1/-3)
plugins/place/src/screen-size-change/tests/CMakeLists.txt (+1/-3)
plugins/place/src/smart/tests/CMakeLists.txt (+1/-3)
plugins/resize/src/logic/tests/CMakeLists.txt (+1/-3)
plugins/wall/src/offset_movement/tests/CMakeLists.txt (+1/-3)
src/option/tests/CMakeLists.txt (+0/-1)
src/plugin/tests/CMakeLists.txt (+0/-1)
src/pluginclasshandler/tests/CMakeLists.txt (+0/-3)
src/point/tests/CMakeLists.txt (+1/-3)
src/privatescreen/tests/CMakeLists.txt (+0/-1)
src/rect/tests/CMakeLists.txt (+2/-6)
src/region/tests/CMakeLists.txt (+0/-1)
src/servergrab/tests/CMakeLists.txt (+1/-3)
src/string/tests/CMakeLists.txt (+0/-1)
src/timer/tests/CMakeLists.txt (+4/-12)
src/window/constrainment/tests/CMakeLists.txt (+1/-3)
src/window/extents/tests/CMakeLists.txt (+1/-3)
src/window/geometry-saver/tests/CMakeLists.txt (+1/-3)
src/window/geometry/tests/CMakeLists.txt (+1/-3)
src/wrapsystem/tests/CMakeLists.txt (+0/-1)
tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt (+0/-1)
tests/integration/glib/CMakeLists.txt (+1/-3)
tests/shared/src/CMakeLists.txt (+1/-2)
tests/system/xorg-gtest/tests/CMakeLists.txt (+1/-2)
tests/xorg-gtest/CMakeLists.txt (+0/-3)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1171364
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Compiz Maintainers Pending
Review via email: mp+160126@code.launchpad.net

This proposal has been superseded by a proposal from 2013-04-22.

Commit message

Link in CMAKE_THREAD_LIBS_INIT through GTEST_BOTH_LIBRARIES so it gets
included in everything. Remove redundant links.

(LP: #1171364)

Description of the change

Link in CMAKE_THREAD_LIBS_INIT through GTEST_BOTH_LIBRARIES so it gets
included in everything. Remove redundant links.

I'm not able to reproduce LP: #1171364 , but I assume its due to -lpthread not being passed to every test linker line.

(LP: #1171364)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3660
http://jenkins.qa.ubuntu.com/job/compiz-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/181/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/532

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/143/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :
Download full text (3.8 KiB)

I get this output:

/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib/libgtest.a(gtest-all.cc.o): In function `testing::internal::ThreadLocal<testing::TestPartResultReporterInterface*>::~ThreadLocal()':
gtest-all.cc:(.text._ZN7testing8internal11ThreadLocalIPNS_31TestPartResultReporterInterfaceEED2Ev[_ZN7testing8internal11ThreadLocalIPNS_31TestPartResultReporterInterfaceEED5Ev]+0x16): undefined reference to `pthread_getspecific'
gtest-all.cc:(.text._ZN7testing8internal11ThreadLocalIPNS_31TestPartResultReporterInterfaceEED2Ev[_ZN7testing8internal11ThreadLocalIPNS_31TestPartResultReporterInterfaceEED5Ev]+0x2b): undefined reference to `pthread_key_delete'
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib/libgtest.a(gtest-all.cc.o): In function `testing::internal::ThreadLocal<std::vector<testing::internal::TraceInfo, std::allocator<testing::internal::TraceInfo> > >::~ThreadLocal()':
gtest-all.cc:(.text._ZN7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEED2Ev[_ZN7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEED5Ev]+0x16): undefined reference to `pthread_getspecific'
gtest-all.cc:(.text._ZN7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEED2Ev[_ZN7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEED5Ev]+0x2b): undefined reference to `pthread_key_delete'
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib/libgtest.a(gtest-all.cc.o): In function `testing::internal::ThreadLocal<std::vector<testing::internal::TraceInfo, std::allocator<testing::internal::TraceInfo> > >::GetOrCreateValue() const':
gtest-all.cc:(.text._ZNK7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEE16GetOrCreateValueEv[_ZNK7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEE16GetOrCreateValueEv]+0x18): undefined reference to `pthread_getspecific'
gtest-all.cc:(.text._ZNK7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEE16GetOrCreateValueEv[_ZNK7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEE16GetOrCreateValueEv]+0x7c): undefined reference to `pthread_setspecific'
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib/libgtest.a(gtest-all.cc.o): In function `testing::internal::ThreadLocal<testing::TestPartResultReporterInterface*>::CreateKey()':
gtest-all.cc:(.text._ZN7testing8internal11ThreadLocalIPNS_31TestPartResultReporterInterfaceEE9CreateKeyEv[_ZN7testing8internal11ThreadLocalIPNS_31TestPartResultReporterInterfaceEE9CreateKeyEv]+0x16): undefined reference to `pthread_key_create'
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib/libgtest.a(gtest-all.cc.o): In function `testing::internal::ThreadLocal<std::vector<testing::internal::TraceInfo, std::allocator<testing::internal::TraceInfo> > >::CreateKey()':
gtest-all.cc:(.text._ZN7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEE9CreateKeyEv[_ZN7testing8internal11ThreadLocalISt6vectorINS0_9TraceInfoESaIS3_EEE9CreateKeyEv]+0x16): undefined reference to `pthread_key_create'
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib/libgtest.a(gtest-all.cc.o): In function `testing::internal::ThreadLocal<testing::TestPartResultReporterInterface*>::GetOrCreateValue() const':
gtest-all.cc:(.text._ZNK7testing8internal11Thr...

Read more...

lp:~compiz-team/compiz/compiz.fix_1171364 updated
3661. By Sam Spilsbury

Require FindThreads.cmake

3662. By Sam Spilsbury

Also append CMAKE_THREAD_LIBS_INIT in the case that we found gtest systemwide

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/FindGoogleTest.cmake'
2--- cmake/FindGoogleTest.cmake 2013-02-12 04:30:52 +0000
3+++ cmake/FindGoogleTest.cmake 2013-04-22 18:39:32 +0000
4@@ -8,6 +8,7 @@
5 # GMOCK_MAIN_LIBRARY
6
7 find_package (GTest)
8+find_package (Threads REQUIRED)
9
10 if (NOT GTEST_FOUND)
11
12@@ -21,7 +22,7 @@
13
14 find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
15
16- set (GTEST_BOTH_LIBRARIES gtest gtest_main)
17+ set (GTEST_BOTH_LIBRARIES gtest gtest_main ${CMAKE_THREAD_LIBS_INIT})
18 set (GTEST_FOUND TRUE)
19 set (GTEST_LOCAL_BUILD_REQUIRED TRUE)
20
21
22=== modified file 'compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt'
23--- compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2012-11-26 07:13:04 +0000
24+++ compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
25@@ -20,7 +20,6 @@
26 ${GTEST_BOTH_LIBRARIES}
27 ${GMOCK_LIBRARY}
28 ${GMOCK_MAIN_LIBRARY}
29- ${CMAKE_THREAD_LIBS_INIT}
30 ${LIBCOMPIZCONFIG_LIBRARIES}
31 compizconfig
32 compizconfig_gsettings_settings_test_env
33
34=== modified file 'compizconfig/integration/gnome/tests/CMakeLists.txt'
35--- compizconfig/integration/gnome/tests/CMakeLists.txt 2012-09-23 16:46:19 +0000
36+++ compizconfig/integration/gnome/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
37@@ -25,7 +25,6 @@
38 ${GTEST_BOTH_LIBRARIES}
39 ${GMOCK_LIBRARY}
40 ${GMOCK_MAIN_LIBRARY}
41- ${CMAKE_THREAD_LIBS_INIT}
42 ${LIBCOMPIZCONFIG_LIBRARIES}
43 compizconfig
44 compizconfig_ccs_context_mock
45
46=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
47--- compizconfig/libcompizconfig/tests/CMakeLists.txt 2013-02-21 16:41:49 +0000
48+++ compizconfig/libcompizconfig/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
49@@ -50,7 +50,6 @@
50 ${GTEST_BOTH_LIBRARIES}
51 ${GMOCK_LIBRARY}
52 ${GMOCK_MAIN_LIBRARY}
53- ${CMAKE_THREAD_LIBS_INIT}
54 ${LIBCOMPIZCONFIG_LIBRARIES}
55 compizconfig)
56
57@@ -58,7 +57,6 @@
58 ${GTEST_BOTH_LIBRARIES}
59 ${GMOCK_LIBRARY}
60 ${GMOCK_MAIN_LIBRARY}
61- ${CMAKE_THREAD_LIBS_INIT}
62 ${LIBCOMPIZCONFIG_LIBRARIES}
63 compizconfig
64 compizconfig_ccs_context_mock
65@@ -72,7 +70,6 @@
66 ${GTEST_BOTH_LIBRARIES}
67 ${GMOCK_LIBRARY}
68 ${GMOCK_MAIN_LIBRARY}
69- ${CMAKE_THREAD_LIBS_INIT}
70 ${LIBCOMPIZCONFIG_LIBRARIES}
71 compizconfig
72 compizconfig_ccs_context_mock
73@@ -83,7 +80,6 @@
74 ${GTEST_BOTH_LIBRARIES}
75 ${GMOCK_LIBRARY}
76 ${GMOCK_MAIN_LIBRARY}
77- ${CMAKE_THREAD_LIBS_INIT}
78 ${LIBCOMPIZCONFIG_LIBRARIES}
79 compizconfig
80 compizconfig_ccs_context_mock
81@@ -95,7 +91,6 @@
82 ${GTEST_BOTH_LIBRARIES}
83 ${GMOCK_LIBRARY}
84 ${GMOCK_MAIN_LIBRARY}
85- ${CMAKE_THREAD_LIBS_INIT}
86 ${LIBCOMPIZCONFIG_LIBRARIES}
87 compizconfig
88 compizconfig_ccs_context_mock
89@@ -113,7 +108,6 @@
90 ${GTEST_BOTH_LIBRARIES}
91 ${GMOCK_LIBRARY}
92 ${GMOCK_MAIN_LIBRARY}
93- ${CMAKE_THREAD_LIBS_INIT}
94 ${LIBCOMPIZCONFIG_LIBRARIES}
95 compizconfig
96 compizconfig_ccs_context_mock
97@@ -125,7 +119,6 @@
98 ${GTEST_BOTH_LIBRARIES}
99 ${GMOCK_LIBRARY}
100 ${GMOCK_MAIN_LIBRARY}
101- ${CMAKE_THREAD_LIBS_INIT}
102 ${LIBCOMPIZCONFIG_LIBRARIES}
103 ccs_text_file_interface
104 compizconfig_ccs_text_file_mock
105@@ -135,7 +128,6 @@
106 ${GTEST_BOTH_LIBRARIES}
107 ${GMOCK_LIBRARY}
108 ${GMOCK_MAIN_LIBRARY}
109- ${CMAKE_THREAD_LIBS_INIT}
110 ccs_settings_upgrade_internal
111 compizconfig
112 compizconfig_ccs_context_mock
113@@ -149,7 +141,6 @@
114 ${GTEST_BOTH_LIBRARIES}
115 ${GMOCK_LIBRARY}
116 ${GMOCK_MAIN_LIBRARY}
117- ${CMAKE_THREAD_LIBS_INIT}
118 compizconfig
119 )
120
121
122=== modified file 'compizconfig/mocks/libcompizconfig/CMakeLists.txt'
123--- compizconfig/mocks/libcompizconfig/CMakeLists.txt 2013-02-21 05:21:26 +0000
124+++ compizconfig/mocks/libcompizconfig/CMakeLists.txt 2013-04-22 18:39:32 +0000
125@@ -47,7 +47,6 @@
126 ${GTEST_BOTH_LIBRARIES}
127 ${GMOCK_LIBRARY}
128 ${GMOCK_MAIN_LIBRARY}
129- ${CMAKE_THREAD_LIBS_INIT}
130 ${LIBCOMPIZCONFIG_LIBRARIES}
131 compizconfig)
132
133@@ -55,7 +54,6 @@
134 ${GTEST_BOTH_LIBRARIES}
135 ${GMOCK_LIBRARY}
136 ${GMOCK_MAIN_LIBRARY}
137- ${CMAKE_THREAD_LIBS_INIT}
138 ${LIBCOMPIZCONFIG_LIBRARIES}
139 compizconfig)
140
141@@ -63,7 +61,6 @@
142 ${GTEST_BOTH_LIBRARIES}
143 ${GMOCK_LIBRARY}
144 ${GMOCK_MAIN_LIBRARY}
145- ${CMAKE_THREAD_LIBS_INIT}
146 ${LIBCOMPIZCONFIG_LIBRARIES}
147 compizconfig)
148
149@@ -71,54 +68,46 @@
150 ${GTEST_BOTH_LIBRARIES}
151 ${GMOCK_LIBRARY}
152 ${GMOCK_MAIN_LIBRARY}
153- ${CMAKE_THREAD_LIBS_INIT}
154 ${LIBCOMPIZCONFIG_LIBRARIES}
155 compizconfig)
156
157 target_link_libraries (compizconfig_ccs_text_file_mock
158 ${GTEST_BOTH_LIBRARIES}
159 ${GMOCK_LIBRARY}
160- ${GMOCK_MAIN_LIBRARY}
161- ${CMAKE_THREAD_LIBS_INIT})
162+ ${GMOCK_MAIN_LIBRARY})
163
164 target_link_libraries (compizconfig_ccs_config_file_mock
165 ${GTEST_BOTH_LIBRARIES}
166 ${GMOCK_LIBRARY}
167 ${GMOCK_MAIN_LIBRARY}
168- ${CMAKE_THREAD_LIBS_INIT}
169 compizconfig)
170
171 target_link_libraries (compizconfig_ccs_backend_loader_mock
172 ${GTEST_BOTH_LIBRARIES}
173 ${GMOCK_LIBRARY}
174 ${GMOCK_MAIN_LIBRARY}
175- ${CMAKE_THREAD_LIBS_INIT}
176 compizconfig)
177
178 target_link_libraries (compizconfig_ccs_integration_mock
179 ${GTEST_BOTH_LIBRARIES}
180 ${GMOCK_LIBRARY}
181 ${GMOCK_MAIN_LIBRARY}
182- ${CMAKE_THREAD_LIBS_INIT}
183 compizconfig)
184
185 target_link_libraries (compizconfig_ccs_integrated_setting_mock
186 ${GTEST_BOTH_LIBRARIES}
187 ${GMOCK_LIBRARY}
188 ${GMOCK_MAIN_LIBRARY}
189- ${CMAKE_THREAD_LIBS_INIT}
190 compizconfig)
191
192 target_link_libraries (compizconfig_ccs_integrated_setting_factory_mock
193 ${GTEST_BOTH_LIBRARIES}
194 ${GMOCK_LIBRARY}
195 ${GMOCK_MAIN_LIBRARY}
196- ${CMAKE_THREAD_LIBS_INIT}
197 compizconfig)
198
199 target_link_libraries (compizconfig_ccs_integrated_setting_storage_mock
200 ${GTEST_BOTH_LIBRARIES}
201 ${GMOCK_LIBRARY}
202 ${GMOCK_MAIN_LIBRARY}
203- ${CMAKE_THREAD_LIBS_INIT}
204 compizconfig)
205
206=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
207--- gtk/window-decorator/tests/CMakeLists.txt 2012-09-12 08:35:51 +0000
208+++ gtk/window-decorator/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
209@@ -104,7 +104,6 @@
210 ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
211 decoration
212 ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
213- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
214 ${GTEST_BOTH_LIBRARIES}
215 ${GMOCK_LIBRARY}
216 ${GMOCK_MAIN_LIBRARY})
217@@ -119,7 +118,6 @@
218 target_link_libraries (compiz_test_gwd_cairo_decorations
219 gtk_window_decorator_cairo_window_decoration_util
220 ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
221- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
222 ${GTEST_BOTH_LIBRARIES}
223 ${GMOCK_LIBRARY}
224 ${GMOCK_MAIN_LIBRARY}
225@@ -134,7 +132,6 @@
226 target_link_libraries (compiz_test_gwd_metacity_decorations
227 gtk_window_decorator_metacity_window_decoration_util
228 ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
229- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
230 ${GTEST_BOTH_LIBRARIES}
231 ${GMOCK_LIBRARY}
232 ${GMOCK_MAIN_LIBRARY}
233
234=== modified file 'plugins/composite/src/pixmapbinding/tests/CMakeLists.txt'
235--- plugins/composite/src/pixmapbinding/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
236+++ plugins/composite/src/pixmapbinding/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
237@@ -17,8 +17,6 @@
238 compiz_composite_pixmapbinding
239 ${GTEST_BOTH_LIBRARIES}
240 ${GMOCK_LIBRARY}
241- ${GMOCK_MAIN_LIBRARY}
242- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
243- )
244+ ${GMOCK_MAIN_LIBRARY})
245
246 compiz_discover_tests (compiz_test_composite_pixmapbinding COVERAGE compiz_composite_pixmapbinding)
247
248=== modified file 'plugins/decor/src/clip-groups/tests/CMakeLists.txt'
249--- plugins/decor/src/clip-groups/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
250+++ plugins/decor/src/clip-groups/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
251@@ -7,8 +7,6 @@
252 compiz_decor_clip_groups
253 ${GTEST_BOTH_LIBRARIES}
254 ${GMOCK_LIBRARY}
255- ${GMOCK_MAIN_LIBRARY}
256- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
257- )
258+ ${GMOCK_MAIN_LIBRARY})
259
260 compiz_discover_tests (compiz_test_decor_clip_groups COVERAGE compiz_decor_clip_groups)
261
262=== modified file 'plugins/decor/src/pixmap-requests/tests/CMakeLists.txt'
263--- plugins/decor/src/pixmap-requests/tests/CMakeLists.txt 2013-02-11 10:22:40 +0000
264+++ plugins/decor/src/pixmap-requests/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
265@@ -15,9 +15,7 @@
266 decoration
267 ${GTEST_BOTH_LIBRARIES}
268 ${GMOCK_LIBRARY}
269- ${GMOCK_MAIN_LIBRARY}
270- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
271- )
272+ ${GMOCK_MAIN_LIBRARY})
273
274 compiz_discover_tests (compiz_test_decor_pixmap_requests COVERAGE compiz_decor_pixmap_requests)
275
276
277=== modified file 'plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt'
278--- plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt 2013-02-20 03:07:58 +0000
279+++ plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt 2013-04-22 18:39:32 +0000
280@@ -26,7 +26,6 @@
281 ${GMOCK_LIBRARY}
282 ${GMOCK_MAIN_LIBRARY}
283 ${GTEST_BOTH_LIBRARIES}
284- ${CMAKE_THREAD_LIBS_INIT}
285 ${XORG_SERVER_LIBRARIES}
286 ${X11_XI_LIBRARIES}
287 ${COMPIZ_DECOR_PIXMAP_PROTOCOL_INTEGRATION_LIBRARIES})
288
289=== modified file 'plugins/expo/src/click_threshold/tests/CMakeLists.txt'
290--- plugins/expo/src/click_threshold/tests/CMakeLists.txt 2012-08-09 20:14:36 +0000
291+++ plugins/expo/src/click_threshold/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
292@@ -12,8 +12,6 @@
293
294 target_link_libraries (compiz_test_expo_click_threshold
295 compiz_expo_click_threshold
296- ${GTEST_BOTH_LIBRARIES}
297- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
298- )
299+ ${GTEST_BOTH_LIBRARIES})
300
301 compiz_discover_tests (compiz_test_expo_click_threshold COVERAGE compiz_expo_click_threshold)
302
303=== modified file 'plugins/expo/src/wall_offset/tests/CMakeLists.txt'
304--- plugins/expo/src/wall_offset/tests/CMakeLists.txt 2012-11-23 09:07:48 +0000
305+++ plugins/expo/src/wall_offset/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
306@@ -12,8 +12,6 @@
307
308 target_link_libraries (compiz_test_expo_wall_offset
309 compiz_expo_wall_offset
310- ${GTEST_BOTH_LIBRARIES}
311- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
312- )
313+ ${GTEST_BOTH_LIBRARIES})
314
315 compiz_discover_tests (compiz_test_expo_wall_offset COVERAGE compiz_expo_wall_offset)
316
317=== modified file 'plugins/grid/src/grabhandler/tests/CMakeLists.txt'
318--- plugins/grid/src/grabhandler/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
319+++ plugins/grid/src/grabhandler/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
320@@ -17,8 +17,6 @@
321 compiz_grid_grabhandler
322 ${GTEST_BOTH_LIBRARIES}
323 ${GMOCK_LIBRARY}
324- ${GMOCK_MAIN_LIBRARY}
325- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
326- )
327+ ${GMOCK_MAIN_LIBRARY})
328
329 compiz_discover_tests (compiz_test_grid_grabhandler COVERAGE compiz_grid_grabhandler)
330
331=== modified file 'plugins/opengl/src/doublebuffer/tests/CMakeLists.txt'
332--- plugins/opengl/src/doublebuffer/tests/CMakeLists.txt 2012-10-03 08:45:27 +0000
333+++ plugins/opengl/src/doublebuffer/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
334@@ -17,8 +17,6 @@
335 compiz_opengl_double_buffer
336 ${GTEST_BOTH_LIBRARIES}
337 ${GMOCK_LIBRARY}
338- ${GMOCK_MAIN_LIBRARY}
339- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
340- )
341+ ${GMOCK_MAIN_LIBRARY})
342
343 compiz_discover_tests (compiz_test_opengl_double_buffer COVERAGE compiz_opengl_double_buffer)
344
345=== modified file 'plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt'
346--- plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt 2012-09-18 11:32:20 +0000
347+++ plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
348@@ -17,8 +17,6 @@
349 compiz_opengl_glx_tfp_bind
350 ${GTEST_BOTH_LIBRARIES}
351 ${GMOCK_LIBRARY}
352- ${GMOCK_MAIN_LIBRARY}
353- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
354- )
355+ ${GMOCK_MAIN_LIBRARY})
356
357 compiz_discover_tests (compiz_test_opengl_glx_tfp_bind COVERAGE compiz_opengl_glx_tfp_bind)
358
359=== modified file 'plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt'
360--- plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
361+++ plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
362@@ -11,8 +11,6 @@
363 compiz_place_constrain_to_workarea
364 ${GTEST_BOTH_LIBRARIES}
365 ${GMOCK_LIBRARY}
366- ${GMOCK_MAIN_LIBRARY}
367- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
368- )
369+ ${GMOCK_MAIN_LIBRARY})
370
371 compiz_discover_tests (compiz_test_place_constrain_to_workarea COVERAGE compiz_place_constrain_to_workarea)
372
373=== modified file 'plugins/place/src/screen-size-change/tests/CMakeLists.txt'
374--- plugins/place/src/screen-size-change/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
375+++ plugins/place/src/screen-size-change/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
376@@ -11,8 +11,6 @@
377 compiz_place_screen_size_change
378 ${GTEST_BOTH_LIBRARIES}
379 ${GMOCK_LIBRARY}
380- ${GMOCK_MAIN_LIBRARY}
381- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
382- )
383+ ${GMOCK_MAIN_LIBRARY})
384
385 compiz_discover_tests (compiz_test_place_screen_size_change COVERAGE compiz_place_screen_size_change)
386
387=== modified file 'plugins/place/src/smart/tests/CMakeLists.txt'
388--- plugins/place/src/smart/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
389+++ plugins/place/src/smart/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
390@@ -7,8 +7,6 @@
391 compiz_place_smart
392 ${GTEST_BOTH_LIBRARIES}
393 ${GMOCK_LIBRARY}
394- ${GMOCK_MAIN_LIBRARY}
395- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
396- )
397+ ${GMOCK_MAIN_LIBRARY})
398
399 compiz_discover_tests (compiz_test_place_smart_on_screen COVERAGE compiz_place_smart)
400
401=== modified file 'plugins/resize/src/logic/tests/CMakeLists.txt'
402--- plugins/resize/src/logic/tests/CMakeLists.txt 2012-08-15 21:18:11 +0000
403+++ plugins/resize/src/logic/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
404@@ -20,8 +20,6 @@
405 compiz_core
406 ${GTEST_BOTH_LIBRARIES}
407 ${GMOCK_LIBRARY}
408- ${GMOCK_MAIN_LIBRARY}
409- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
410- )
411+ ${GMOCK_MAIN_LIBRARY})
412
413 compiz_discover_tests (compiz_test_resize_logic COVERAGE resize_logic)
414
415=== modified file 'plugins/wall/src/offset_movement/tests/CMakeLists.txt'
416--- plugins/wall/src/offset_movement/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
417+++ plugins/wall/src/offset_movement/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
418@@ -17,8 +17,6 @@
419 compiz_wall_offset_movement
420 ${GTEST_BOTH_LIBRARIES}
421 ${GMOCK_LIBRARY}
422- ${GMOCK_MAIN_LIBRARY}
423- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
424- )
425+ ${GMOCK_MAIN_LIBRARY})
426
427 compiz_discover_tests (compiz_test_wall_offset_movement COVERAGE compiz_wall_offset_movement)
428
429=== modified file 'src/option/tests/CMakeLists.txt'
430--- src/option/tests/CMakeLists.txt 2012-12-10 13:01:00 +0000
431+++ src/option/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
432@@ -26,7 +26,6 @@
433 compiz_core
434
435 ${GTEST_BOTH_LIBRARIES}
436- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
437 )
438
439 compiz_discover_tests ( compiz_option_test COVERAGE compiz_core )
440
441=== modified file 'src/plugin/tests/CMakeLists.txt'
442--- src/plugin/tests/CMakeLists.txt 2013-02-14 02:35:39 +0000
443+++ src/plugin/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
444@@ -30,7 +30,6 @@
445
446 ${GTEST_BOTH_LIBRARIES}
447 ${GMOCK_LIBRARY}
448- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
449 )
450
451 compiz_discover_tests ( compiz_plugin_test COVERAGE compiz_plugin compiz_core )
452
453=== modified file 'src/pluginclasshandler/tests/CMakeLists.txt'
454--- src/pluginclasshandler/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
455+++ src/pluginclasshandler/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
456@@ -35,7 +35,6 @@
457 compiz_string
458
459 ${GTEST_BOTH_LIBRARIES}
460- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
461 )
462
463 target_link_libraries(
464@@ -47,7 +46,6 @@
465 compiz_string
466
467 ${GTEST_BOTH_LIBRARIES}
468- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
469 )
470
471 target_link_libraries(
472@@ -59,7 +57,6 @@
473 compiz_string
474
475 ${GTEST_BOTH_LIBRARIES}
476- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
477 )
478
479 # Not compilable
480
481=== modified file 'src/point/tests/CMakeLists.txt'
482--- src/point/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
483+++ src/point/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
484@@ -11,8 +11,6 @@
485 compiz_point
486 ${GTEST_BOTH_LIBRARIES}
487 ${GMOCK_LIBRARY}
488- ${GMOCK_MAIN_LIBRARY}
489- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
490- )
491+ ${GMOCK_MAIN_LIBRARY})
492
493 compiz_discover_tests (compiz_test_point COVERAGE compiz_point)
494
495=== modified file 'src/privatescreen/tests/CMakeLists.txt'
496--- src/privatescreen/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
497+++ src/privatescreen/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
498@@ -50,7 +50,6 @@
499
500 ${GTEST_BOTH_LIBRARIES}
501 ${GMOCK_LIBRARY}
502- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
503 )
504
505 compiz_discover_tests (compiz_privatescreen_test COVERAGE compiz_core)
506
507=== modified file 'src/rect/tests/CMakeLists.txt'
508--- src/rect/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
509+++ src/rect/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
510@@ -14,18 +14,14 @@
511 compiz_rect
512 ${GTEST_BOTH_LIBRARIES}
513 ${GMOCK_LIBRARY}
514- ${GMOCK_MAIN_LIBRARY}
515- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
516- )
517+ ${GMOCK_MAIN_LIBRARY})
518
519 target_link_libraries (compiz_test_rect_wraparound_point
520 compiz_rect_test
521 compiz_rect
522 ${GTEST_BOTH_LIBRARIES}
523 ${GMOCK_LIBRARY}
524- ${GMOCK_MAIN_LIBRARY}
525- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
526- )
527+ ${GMOCK_MAIN_LIBRARY})
528
529 compiz_discover_tests (compiz_test_rect COVERAGE compiz_rect)
530 compiz_discover_tests (compiz_test_rect_wraparound_point COVERAGE compiz_rect)
531
532=== modified file 'src/region/tests/CMakeLists.txt'
533--- src/region/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
534+++ src/region/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
535@@ -30,7 +30,6 @@
536
537 ${GTEST_BOTH_LIBRARIES}
538 ${GMOCK_LIBRARY}
539- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
540 )
541
542 compiz_discover_tests (compiz_region_test COVERAGE compiz_region)
543
544=== modified file 'src/servergrab/tests/CMakeLists.txt'
545--- src/servergrab/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
546+++ src/servergrab/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
547@@ -7,8 +7,6 @@
548 compiz_servergrab
549 ${GTEST_BOTH_LIBRARIES}
550 ${GMOCK_LIBRARY}
551- ${GMOCK_MAIN_LIBRARY}
552- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
553- )
554+ ${GMOCK_MAIN_LIBRARY})
555
556 compiz_discover_tests (compiz_test_servergrab COVERAGE compiz_servergrab)
557
558=== modified file 'src/string/tests/CMakeLists.txt'
559--- src/string/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
560+++ src/string/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
561@@ -14,7 +14,6 @@
562 compiz_string
563
564 ${GTEST_BOTH_LIBRARIES}
565- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
566 )
567
568 compiz_discover_tests (compiz_string_test COVERAGE compiz_string)
569
570=== modified file 'src/timer/tests/CMakeLists.txt'
571--- src/timer/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
572+++ src/timer/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
573@@ -20,36 +20,28 @@
574 compiz_timer
575 ${GTEST_BOTH_LIBRARIES}
576 ${GMOCK_LIBRARY}
577- ${GMOCK_MAIN_LIBRARY}
578- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
579- )
580+ ${GMOCK_MAIN_LIBRARY})
581
582 target_link_libraries (compiz_timer_diffs
583 compiz_timer_test
584 compiz_timer
585 ${GTEST_BOTH_LIBRARIES}
586 ${GMOCK_LIBRARY}
587- ${GMOCK_MAIN_LIBRARY}
588- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
589- )
590+ ${GMOCK_MAIN_LIBRARY})
591
592 target_link_libraries (compiz_timer_set-values
593 compiz_timer_test
594 compiz_timer
595 ${GTEST_BOTH_LIBRARIES}
596 ${GMOCK_LIBRARY}
597- ${GMOCK_MAIN_LIBRARY}
598- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
599- )
600+ ${GMOCK_MAIN_LIBRARY})
601
602 target_link_libraries (compiz_timer_while-calling
603 compiz_timer_test
604 compiz_timer
605 ${GTEST_BOTH_LIBRARIES}
606 ${GMOCK_LIBRARY}
607- ${GMOCK_MAIN_LIBRARY}
608- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
609- )
610+ ${GMOCK_MAIN_LIBRARY})
611
612 compiz_discover_tests (compiz_timer_callbacks COVERAGE compiz_timer)
613 compiz_discover_tests (compiz_timer_diffs COVERAGE compiz_timer)
614
615=== modified file 'src/window/constrainment/tests/CMakeLists.txt'
616--- src/window/constrainment/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
617+++ src/window/constrainment/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
618@@ -12,8 +12,6 @@
619 compiz_window_constrainment
620 ${GTEST_BOTH_LIBRARIES}
621 ${GMOCK_LIBRARY}
622- ${GMOCK_MAIN_LIBRARY}
623- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
624- )
625+ ${GMOCK_MAIN_LIBRARY})
626
627 compiz_discover_tests (compiz_test_window_constrainment_to_hints COVERAGE compiz_window_constrainment)
628
629=== modified file 'src/window/extents/tests/CMakeLists.txt'
630--- src/window/extents/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
631+++ src/window/extents/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
632@@ -11,8 +11,6 @@
633 compiz_window_extents
634 ${GTEST_BOTH_LIBRARIES}
635 ${GMOCK_LIBRARY}
636- ${GMOCK_MAIN_LIBRARY}
637- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
638- )
639+ ${GMOCK_MAIN_LIBRARY})
640
641 compiz_discover_tests (compiz_test_window_extents_shift COVERAGE compiz_window_extents)
642
643=== modified file 'src/window/geometry-saver/tests/CMakeLists.txt'
644--- src/window/geometry-saver/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
645+++ src/window/geometry-saver/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
646@@ -11,8 +11,6 @@
647 compiz_window_geometry_saver
648 ${GTEST_BOTH_LIBRARIES}
649 ${GMOCK_LIBRARY}
650- ${GMOCK_MAIN_LIBRARY}
651- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
652- )
653+ ${GMOCK_MAIN_LIBRARY})
654
655 compiz_discover_tests (compiz_test_window_geometry_saver COVERAGE compiz_window_geometry_saver)
656
657=== modified file 'src/window/geometry/tests/CMakeLists.txt'
658--- src/window/geometry/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
659+++ src/window/geometry/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
660@@ -11,8 +11,6 @@
661 compiz_window_geometry
662 ${GTEST_BOTH_LIBRARIES}
663 ${GMOCK_LIBRARY}
664- ${GMOCK_MAIN_LIBRARY}
665- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
666- )
667+ ${GMOCK_MAIN_LIBRARY})
668
669 compiz_discover_tests (compiz_test_window_geometry COVERAGE compiz_window_geometry)
670
671=== modified file 'src/wrapsystem/tests/CMakeLists.txt'
672--- src/wrapsystem/tests/CMakeLists.txt 2012-08-01 00:42:38 +0000
673+++ src/wrapsystem/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
674@@ -12,7 +12,6 @@
675 compiz_wrapsystem_test
676
677 ${GTEST_BOTH_LIBRARIES}
678- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
679 )
680
681 compiz_discover_tests (compiz_wrapsystem_test COVERAGE compiz_core)
682\ No newline at end of file
683
684=== modified file 'tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt'
685--- tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt 2012-12-05 03:35:37 +0000
686+++ tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
687@@ -9,7 +9,6 @@
688 xorg_gtest_all
689 xorg_gtest_main
690 ${GTEST_BOTH_LIBRARIES}
691- ${CMAKE_THREAD_LIBS_INIT}
692 ${XORG_SERVER_LIBRARIES}
693 ${X11_XI_LIBRARIES})
694
695
696=== modified file 'tests/integration/glib/CMakeLists.txt'
697--- tests/integration/glib/CMakeLists.txt 2012-12-02 17:36:21 +0000
698+++ tests/integration/glib/CMakeLists.txt 2013-04-22 18:39:32 +0000
699@@ -21,9 +21,7 @@
700 ${COMPIZ_GLIB_INTEGRATION_TEST_LIBRARIES}
701 ${GTEST_BOTH_LIBRARIES}
702 ${GMOCK_LIBRARY}
703- ${GMOCK_MAIN_LIBRARY}
704- ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
705- )
706+ ${GMOCK_MAIN_LIBRARY})
707
708 compiz_discover_tests (compiz_glib_integration_test COVERAGE compiz_core)
709
710
711=== modified file 'tests/shared/src/CMakeLists.txt'
712--- tests/shared/src/CMakeLists.txt 2012-12-05 02:31:04 +0000
713+++ tests/shared/src/CMakeLists.txt 2013-04-22 18:39:32 +0000
714@@ -3,5 +3,4 @@
715 add_library (compiz_gtest_shared_async_task STATIC
716 gtest_shared_asynctask.cpp)
717
718-target_link_libraries (compiz_gtest_shared_async_task
719- ${CMAKE_THREAD_LIBS_INIT})
720+target_link_libraries (compiz_gtest_shared_async_task)
721
722=== modified file 'tests/system/xorg-gtest/tests/CMakeLists.txt'
723--- tests/system/xorg-gtest/tests/CMakeLists.txt 2013-02-21 16:54:43 +0000
724+++ tests/system/xorg-gtest/tests/CMakeLists.txt 2013-04-22 18:39:32 +0000
725@@ -34,8 +34,7 @@
726 xorg_gtest_main
727 ${GTEST_BOTH_LIBRARIES}
728 ${XORG_SERVER_LIBRARIES}
729- ${X11_XI_LIBRARIES}
730- ${CMAKE_THREAD_LIBS_INIT})
731+ ${X11_XI_LIBRARIES})
732
733 target_link_libraries (compiz_xorg_gtest_test_window_stacking
734 ${COMPIZ_XORG_GTEST_LIBRARIES})
735
736=== modified file 'tests/xorg-gtest/CMakeLists.txt'
737--- tests/xorg-gtest/CMakeLists.txt 2013-02-22 06:55:38 +0000
738+++ tests/xorg-gtest/CMakeLists.txt 2013-04-22 18:39:32 +0000
739@@ -41,19 +41,16 @@
740
741 target_link_libraries (xorg_gtest_all
742 ${GTEST_BOTH_LIBRARIES}
743- ${CMAKE_THREAD_LIBS_INIT}
744 ${XORG_SERVER_GTEST_LIBRARIES})
745
746 target_link_libraries (xorg_gtest_main
747 ${GTEST_BOTH_LIBRARIES}
748- ${CMAKE_THREAD_LIBS_INIT}
749 ${XORG_SERVER_GTEST_LIBRARIES})
750
751 target_link_libraries (compiz_xorg_gtest_system_test
752 xorg_gtest_all
753 xorg_gtest_main
754 ${GTEST_BOTH_LIBRARIES}
755- ${CMAKE_THREAD_LIBS_INIT}
756 ${XORG_SERVER_LIBRARIES}
757 ${COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY}
758 ${X11_XI_LIBRARIES})

Subscribers

People subscribed via source and target branches

to all changes: