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: 768 lines (+34/-123)
40 files modified
cmake/FindGoogleTest.cmake (+5/-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 Approve
Sam Spilsbury Abstain
Review via email: mp+160177@code.launchpad.net

This proposal supersedes a proposal from 2013-04-22.

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

Commit message

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

(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. Require FindThreads.cmake

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal
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...

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Try it now.

review: Approve
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Oops

review: Abstain
Revision history for this message
MC Return (mc-return) wrote :

/offtopic on

btw, the automerger is still in weekend mode it seems ;)

/offtopic off

I retried the latest version, but still getting those undefined references...
but judging from your last comment you seem to have found the cause, yes ?

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Evidently not. I need to go to bed now because its 2:50AM. But what
you can do for me is post on a pastebin the output of cmake ..
-DCMAKE_VERBOSE_MAKEFILE=ON && make . I need to see if -lpthread is
being passed into the right places.

On Tue, Apr 23, 2013 at 2:49 AM, MC Return <email address hidden> wrote:
> /offtopic on
>
> btw, the automerger is still in weekend mode it seems ;)
>
> /offtopic off
>
> I retried the latest version, but still getting those undefined references...
> but judging from your last comment you seem to have found the cause, yes ?
> --
> https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1171364/+merge/160177
> You proposed lp:~compiz-team/compiz/compiz.fix_1171364 for merging.

--
Sam Spilsbury

Revision history for this message
MC Return (mc-return) wrote :

> Evidently not. I need to go to bed now because its 2:50AM. But what
> you can do for me is post on a pastebin the output of cmake ..
> -DCMAKE_VERBOSE_MAKEFILE=ON && make . I need to see if -lpthread is
> being passed into the right places.
>
Posted it here: http://pastebin.com/biBGx6tG

No stress, please. Go to sleep ;)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3661
http://jenkins.qa.ubuntu.com/job/compiz-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/534

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

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Curious.

It seems to me like cmake was unable to find pthread on your system. Can you add the following to cmake/FindGoogleTest.cmake right after find_package (Threads REQUIRED)

message ("[debug] CMake detected threads library - " ${CMAKE_THREAD_LIBS_INIT})

And then post the output of cmake?

Revision history for this message
MC Return (mc-return) wrote :

> Curious.
>
> It seems to me like cmake was unable to find pthread on your system. Can you
> add the following to cmake/FindGoogleTest.cmake right after find_package
> (Threads REQUIRED)
>
> message ("[debug] CMake detected threads library - "
> ${CMAKE_THREAD_LIBS_INIT})
>
> And then post the output of cmake?

Here it is (the beginning of it only):
-- Could NOT find gcovr (missing: GCOVR_EXECUTABLE)
[debug] CMake detected threads library - -lpthread
-- Found xorg-gtest sources at /usr/src/xorg-gtest

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Actually, can you post the full output again with this branch? Use make -k . It might be that we're getting the undefined references in other areas now.

Revision history for this message
MC Return (mc-return) wrote :

> Actually, can you post the full output again with this branch? Use make -k .
> It might be that we're getting the undefined references in other areas now.

Unos momentos.

Revision history for this message
MC Return (mc-return) wrote :

It is freakin' long, but paste.ubuntu.com saved my day - here it comes:

http://paste.ubuntu.com/5598745/

Revision history for this message
MC Return (mc-return) wrote :

/offtopic on

Could you please update the lp:compiz trunk 0.9.10-dev PPA ?

https://launchpad.net/~smspillaz/+archive/compiz-dev

It seems that it is still using 0.9.9 version number and also has no plugin packages...
It would be great to have it to be able to run Compiz from trunk with all the goodies and
it would make testing for outsiders a lot easier if it would all work nicely...

/offtopic off

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

Subscribers

People subscribed via source and target branches

to all changes: