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

[Sam Spilsbury]

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

(LP: #1171364)

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)

[PS Jenkins bot (ps-jenkins)]

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)

[MC Return (mc-return)]

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...

[lp:~compiz-team/compiz/compiz.fix_1171364]

3661. By Sam Spilsbury on 2013-04-22

Require FindThreads.cmake

3662. By Sam Spilsbury on 2013-04-25

Also append CMAKE_THREAD_LIBS_INIT in the case that we found gtest systemwide

Unmerged revisions

=== modified file 'cmake/FindGoogleTest.cmake'
--- cmake/FindGoogleTest.cmake	2013-02-12 04:30:52 +0000
+++ cmake/FindGoogleTest.cmake	2013-04-22 18:39:32 +0000
@@ -8,6 +8,7 @@
 # GMOCK_MAIN_LIBRARY
 
 find_package (GTest)
+find_package (Threads REQUIRED)
 
 if (NOT GTEST_FOUND)
 
@@ -21,7 +22,7 @@
 
     find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
 
-    set (GTEST_BOTH_LIBRARIES gtest gtest_main)
+    set (GTEST_BOTH_LIBRARIES gtest gtest_main ${CMAKE_THREAD_LIBS_INIT})
     set (GTEST_FOUND TRUE)
     set (GTEST_LOCAL_BUILD_REQUIRED TRUE)
 
 
=== modified file 'compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt'
--- compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt	2012-11-26 07:13:04 +0000
+++ compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -20,7 +20,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_gsettings_settings_test_env
 
=== modified file 'compizconfig/integration/gnome/tests/CMakeLists.txt'
--- compizconfig/integration/gnome/tests/CMakeLists.txt	2012-09-23 16:46:19 +0000
+++ compizconfig/integration/gnome/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -25,7 +25,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_ccs_context_mock
 
=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
--- compizconfig/libcompizconfig/tests/CMakeLists.txt	2013-02-21 16:41:49 +0000
+++ compizconfig/libcompizconfig/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -50,7 +50,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig)
 
@@ -58,7 +57,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_ccs_context_mock
@@ -72,7 +70,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_ccs_context_mock
@@ -83,7 +80,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_ccs_context_mock
@@ -95,7 +91,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_ccs_context_mock
@@ -113,7 +108,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig
 		       compizconfig_ccs_context_mock
@@ -125,7 +119,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       ccs_text_file_interface
                        compizconfig_ccs_text_file_mock
@@ -135,7 +128,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
                        ccs_settings_upgrade_internal
                        compizconfig
                        compizconfig_ccs_context_mock
@@ -149,7 +141,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
                        compizconfig
 )
 
 
=== modified file 'compizconfig/mocks/libcompizconfig/CMakeLists.txt'
--- compizconfig/mocks/libcompizconfig/CMakeLists.txt	2013-02-21 05:21:26 +0000
+++ compizconfig/mocks/libcompizconfig/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -47,7 +47,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig)
 
@@ -55,7 +54,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig)
 
@@ -63,7 +61,6 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig)
 
@@ -71,54 +68,46 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
 		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig)
 
 target_link_libraries (compizconfig_ccs_text_file_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
-                       ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT})
+                       ${GMOCK_MAIN_LIBRARY})
 
 target_link_libraries (compizconfig_ccs_config_file_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
                        ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT}
 		       compizconfig)
 
 target_link_libraries (compizconfig_ccs_backend_loader_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
                        ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT}
 		       compizconfig)
 
 target_link_libraries (compizconfig_ccs_integration_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
                        ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT}
 		       compizconfig)
 
 target_link_libraries (compizconfig_ccs_integrated_setting_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
                        ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT}
 		       compizconfig)
 
 target_link_libraries (compizconfig_ccs_integrated_setting_factory_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
                        ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT}
 		       compizconfig)
 
 target_link_libraries (compizconfig_ccs_integrated_setting_storage_mock
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
                        ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT}
 		       compizconfig)
 
=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2012-09-12 08:35:51 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -104,7 +104,6 @@
 			   ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
 			   decoration
 			   ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
-			   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 			   ${GTEST_BOTH_LIBRARIES}
 			   ${GMOCK_LIBRARY}
 		       	   ${GMOCK_MAIN_LIBRARY})
@@ -119,7 +118,6 @@
     target_link_libraries (compiz_test_gwd_cairo_decorations
 			   gtk_window_decorator_cairo_window_decoration_util
 			   ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
-			   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 			   ${GTEST_BOTH_LIBRARIES}
 			   ${GMOCK_LIBRARY}
 		       	   ${GMOCK_MAIN_LIBRARY}
@@ -134,7 +132,6 @@
     target_link_libraries (compiz_test_gwd_metacity_decorations
 			   gtk_window_decorator_metacity_window_decoration_util
 			   ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
-			   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 			   ${GTEST_BOTH_LIBRARIES}
 			   ${GMOCK_LIBRARY}
 		       	   ${GMOCK_MAIN_LIBRARY}
 
=== modified file 'plugins/composite/src/pixmapbinding/tests/CMakeLists.txt'
--- plugins/composite/src/pixmapbinding/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/composite/src/pixmapbinding/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -17,8 +17,6 @@
                        compiz_composite_pixmapbinding
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_composite_pixmapbinding COVERAGE compiz_composite_pixmapbinding)
 
=== modified file 'plugins/decor/src/clip-groups/tests/CMakeLists.txt'
--- plugins/decor/src/clip-groups/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/decor/src/clip-groups/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -7,8 +7,6 @@
 		       compiz_decor_clip_groups
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_decor_clip_groups COVERAGE compiz_decor_clip_groups)
 
=== modified file 'plugins/decor/src/pixmap-requests/tests/CMakeLists.txt'
--- plugins/decor/src/pixmap-requests/tests/CMakeLists.txt	2013-02-11 10:22:40 +0000
+++ plugins/decor/src/pixmap-requests/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -15,9 +15,7 @@
 		       decoration
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_decor_pixmap_requests COVERAGE compiz_decor_pixmap_requests)
 
 
=== modified file 'plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt'
--- plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt	2013-02-20 03:07:58 +0000
+++ plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -26,7 +26,6 @@
          ${GMOCK_LIBRARY}
          ${GMOCK_MAIN_LIBRARY}
          ${GTEST_BOTH_LIBRARIES}
-         ${CMAKE_THREAD_LIBS_INIT}
          ${XORG_SERVER_LIBRARIES}
          ${X11_XI_LIBRARIES}
          ${COMPIZ_DECOR_PIXMAP_PROTOCOL_INTEGRATION_LIBRARIES})
 
=== modified file 'plugins/expo/src/click_threshold/tests/CMakeLists.txt'
--- plugins/expo/src/click_threshold/tests/CMakeLists.txt	2012-08-09 20:14:36 +0000
+++ plugins/expo/src/click_threshold/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -12,8 +12,6 @@
 
 target_link_libraries (compiz_test_expo_click_threshold
 		       compiz_expo_click_threshold
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GTEST_BOTH_LIBRARIES})
 
 compiz_discover_tests (compiz_test_expo_click_threshold COVERAGE compiz_expo_click_threshold)
 
=== modified file 'plugins/expo/src/wall_offset/tests/CMakeLists.txt'
--- plugins/expo/src/wall_offset/tests/CMakeLists.txt	2012-11-23 09:07:48 +0000
+++ plugins/expo/src/wall_offset/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -12,8 +12,6 @@
 
 target_link_libraries (compiz_test_expo_wall_offset
 		       compiz_expo_wall_offset
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GTEST_BOTH_LIBRARIES})
 
 compiz_discover_tests (compiz_test_expo_wall_offset COVERAGE compiz_expo_wall_offset)
 
=== modified file 'plugins/grid/src/grabhandler/tests/CMakeLists.txt'
--- plugins/grid/src/grabhandler/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/grid/src/grabhandler/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -17,8 +17,6 @@
                        compiz_grid_grabhandler
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_grid_grabhandler COVERAGE compiz_grid_grabhandler)
 
=== modified file 'plugins/opengl/src/doublebuffer/tests/CMakeLists.txt'
--- plugins/opengl/src/doublebuffer/tests/CMakeLists.txt	2012-10-03 08:45:27 +0000
+++ plugins/opengl/src/doublebuffer/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -17,8 +17,6 @@
                        compiz_opengl_double_buffer
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_opengl_double_buffer COVERAGE compiz_opengl_double_buffer)
 
=== modified file 'plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt'
--- plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt	2012-09-18 11:32:20 +0000
+++ plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -17,8 +17,6 @@
                        compiz_opengl_glx_tfp_bind
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_opengl_glx_tfp_bind COVERAGE compiz_opengl_glx_tfp_bind)
 
=== modified file 'plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt'
--- plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -11,8 +11,6 @@
                        compiz_place_constrain_to_workarea
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_place_constrain_to_workarea COVERAGE compiz_place_constrain_to_workarea)
 
=== modified file 'plugins/place/src/screen-size-change/tests/CMakeLists.txt'
--- plugins/place/src/screen-size-change/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/place/src/screen-size-change/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -11,8 +11,6 @@
                        compiz_place_screen_size_change
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_place_screen_size_change COVERAGE compiz_place_screen_size_change)
 
=== modified file 'plugins/place/src/smart/tests/CMakeLists.txt'
--- plugins/place/src/smart/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/place/src/smart/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -7,8 +7,6 @@
 		       compiz_place_smart
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_place_smart_on_screen COVERAGE compiz_place_smart)
 
=== modified file 'plugins/resize/src/logic/tests/CMakeLists.txt'
--- plugins/resize/src/logic/tests/CMakeLists.txt	2012-08-15 21:18:11 +0000
+++ plugins/resize/src/logic/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -20,8 +20,6 @@
                        compiz_core
                        ${GTEST_BOTH_LIBRARIES}
                        ${GMOCK_LIBRARY}
-                       ${GMOCK_MAIN_LIBRARY}
-                       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+                       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_resize_logic COVERAGE resize_logic)
 
=== modified file 'plugins/wall/src/offset_movement/tests/CMakeLists.txt'
--- plugins/wall/src/offset_movement/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ plugins/wall/src/offset_movement/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -17,8 +17,6 @@
                        compiz_wall_offset_movement
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_wall_offset_movement COVERAGE compiz_wall_offset_movement)
 
=== modified file 'src/option/tests/CMakeLists.txt'
--- src/option/tests/CMakeLists.txt	2012-12-10 13:01:00 +0000
+++ src/option/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -26,7 +26,6 @@
   compiz_core
   
   ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 compiz_discover_tests ( compiz_option_test COVERAGE compiz_core )
 
=== modified file 'src/plugin/tests/CMakeLists.txt'
--- src/plugin/tests/CMakeLists.txt	2013-02-14 02:35:39 +0000
+++ src/plugin/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -30,7 +30,6 @@
   
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 compiz_discover_tests ( compiz_plugin_test COVERAGE compiz_plugin compiz_core )
 
=== modified file 'src/pluginclasshandler/tests/CMakeLists.txt'
--- src/pluginclasshandler/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/pluginclasshandler/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -35,7 +35,6 @@
   compiz_string 
   
   ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 target_link_libraries( 
@@ -47,7 +46,6 @@
   compiz_string 
   
   ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 target_link_libraries( 
@@ -59,7 +57,6 @@
   compiz_string 
   
   ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 # Not compilable
 
=== modified file 'src/point/tests/CMakeLists.txt'
--- src/point/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/point/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -11,8 +11,6 @@
                        compiz_point 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_point COVERAGE compiz_point)
 
=== modified file 'src/privatescreen/tests/CMakeLists.txt'
--- src/privatescreen/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/privatescreen/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -50,7 +50,6 @@
   
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 compiz_discover_tests (compiz_privatescreen_test COVERAGE compiz_core)
 
=== modified file 'src/rect/tests/CMakeLists.txt'
--- src/rect/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/rect/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -14,18 +14,14 @@
                        compiz_rect 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 target_link_libraries (compiz_test_rect_wraparound_point
                        compiz_rect_test
                        compiz_rect 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_rect COVERAGE compiz_rect)
 compiz_discover_tests (compiz_test_rect_wraparound_point COVERAGE compiz_rect)
 
=== modified file 'src/region/tests/CMakeLists.txt'
--- src/region/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/region/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -30,7 +30,6 @@
   
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 compiz_discover_tests (compiz_region_test COVERAGE compiz_region)
 
=== modified file 'src/servergrab/tests/CMakeLists.txt'
--- src/servergrab/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/servergrab/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -7,8 +7,6 @@
                        compiz_servergrab
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-		      )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_servergrab COVERAGE compiz_servergrab)
 
=== modified file 'src/string/tests/CMakeLists.txt'
--- src/string/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/string/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -14,7 +14,6 @@
   compiz_string
   
   ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 compiz_discover_tests (compiz_string_test COVERAGE compiz_string)
 
=== modified file 'src/timer/tests/CMakeLists.txt'
--- src/timer/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/timer/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -20,36 +20,28 @@
                        compiz_timer 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 target_link_libraries (compiz_timer_diffs
                        compiz_timer_test
                        compiz_timer 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 target_link_libraries (compiz_timer_set-values
                        compiz_timer_test
                        compiz_timer 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 target_link_libraries (compiz_timer_while-calling
                        compiz_timer_test
                        compiz_timer 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_timer_callbacks COVERAGE compiz_timer)
 compiz_discover_tests (compiz_timer_diffs COVERAGE compiz_timer)
 
=== modified file 'src/window/constrainment/tests/CMakeLists.txt'
--- src/window/constrainment/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/window/constrainment/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -12,8 +12,6 @@
                        compiz_window_constrainment 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_window_constrainment_to_hints COVERAGE compiz_window_constrainment)
 
=== modified file 'src/window/extents/tests/CMakeLists.txt'
--- src/window/extents/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/window/extents/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -11,8 +11,6 @@
                        compiz_window_extents 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_window_extents_shift COVERAGE compiz_window_extents)
 
=== modified file 'src/window/geometry-saver/tests/CMakeLists.txt'
--- src/window/geometry-saver/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/window/geometry-saver/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -11,8 +11,6 @@
                        compiz_window_geometry_saver 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_window_geometry_saver COVERAGE compiz_window_geometry_saver)
 
=== modified file 'src/window/geometry/tests/CMakeLists.txt'
--- src/window/geometry/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/window/geometry/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -11,8 +11,6 @@
                        compiz_window_geometry 
                        ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-                       )
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compiz_test_window_geometry COVERAGE compiz_window_geometry)
 
=== modified file 'src/wrapsystem/tests/CMakeLists.txt'
--- src/wrapsystem/tests/CMakeLists.txt	2012-08-01 00:42:38 +0000
+++ src/wrapsystem/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -12,7 +12,6 @@
   compiz_wrapsystem_test
   
   ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
 compiz_discover_tests (compiz_wrapsystem_test COVERAGE compiz_core)
 \ No newline at end of file
 
=== modified file 'tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt'
--- tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt	2012-12-05 03:35:37 +0000
+++ tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -9,7 +9,6 @@
      xorg_gtest_all
      xorg_gtest_main
      ${GTEST_BOTH_LIBRARIES}
-     ${CMAKE_THREAD_LIBS_INIT}
      ${XORG_SERVER_LIBRARIES}
      ${X11_XI_LIBRARIES})
 
 
=== modified file 'tests/integration/glib/CMakeLists.txt'
--- tests/integration/glib/CMakeLists.txt	2012-12-02 17:36:21 +0000
+++ tests/integration/glib/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -21,9 +21,7 @@
 			   ${COMPIZ_GLIB_INTEGRATION_TEST_LIBRARIES}
 			   ${GTEST_BOTH_LIBRARIES}
 			   ${GMOCK_LIBRARY}
-			   ${GMOCK_MAIN_LIBRARY}
-			   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-			   )
+			   ${GMOCK_MAIN_LIBRARY})
 
     compiz_discover_tests (compiz_glib_integration_test COVERAGE compiz_core)
 
 
=== modified file 'tests/shared/src/CMakeLists.txt'
--- tests/shared/src/CMakeLists.txt	2012-12-05 02:31:04 +0000
+++ tests/shared/src/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -3,5 +3,4 @@
 add_library (compiz_gtest_shared_async_task STATIC
              gtest_shared_asynctask.cpp)
 
-target_link_libraries (compiz_gtest_shared_async_task
-		       ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries (compiz_gtest_shared_async_task)
 
=== modified file 'tests/system/xorg-gtest/tests/CMakeLists.txt'
--- tests/system/xorg-gtest/tests/CMakeLists.txt	2013-02-21 16:54:43 +0000
+++ tests/system/xorg-gtest/tests/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -34,8 +34,7 @@
 	 xorg_gtest_main
          ${GTEST_BOTH_LIBRARIES}
 	 ${XORG_SERVER_LIBRARIES}
-	 ${X11_XI_LIBRARIES}
-	 ${CMAKE_THREAD_LIBS_INIT})
+	 ${X11_XI_LIBRARIES})
 
     target_link_libraries (compiz_xorg_gtest_test_window_stacking
 			   ${COMPIZ_XORG_GTEST_LIBRARIES})
 
=== modified file 'tests/xorg-gtest/CMakeLists.txt'
--- tests/xorg-gtest/CMakeLists.txt	2013-02-22 06:55:38 +0000
+++ tests/xorg-gtest/CMakeLists.txt	2013-04-22 18:39:32 +0000
@@ -41,19 +41,16 @@
 
 target_link_libraries (xorg_gtest_all
 		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${XORG_SERVER_GTEST_LIBRARIES})
 
 target_link_libraries (xorg_gtest_main
 		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${XORG_SERVER_GTEST_LIBRARIES})
 
 target_link_libraries (compiz_xorg_gtest_system_test
 		       xorg_gtest_all
 		       xorg_gtest_main
 		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT}
 		       ${XORG_SERVER_LIBRARIES}
 		       ${COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY}
 		       ${X11_XI_LIBRARIES})