Merge lp:~compiz-team/compiz/compiz.fix_1058149 into lp:compiz/0.9.9

[Sam Spilsbury]

Add necessary libraries to test targets. Fixes FTBFS with GNU gold linker.
(LP: #1058149)

Add necessary libraries to test targets. Fixes FTBFS with gold.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3406
http://jenkins.qa.ubuntu.com/job/compiz-ci/150/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/150/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
--- compizconfig/gsettings/tests/CMakeLists.txt	2012-09-22 04:26:38 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2012-09-30 02:10:33 +0000
@@ -11,7 +11,7 @@
                      ${CMAKE_SOURCE_DIR}/tests/shared
                      ${CMAKE_SOURCE_DIR}/tests/shared/glib)
 
-pkg_check_modules (COMPIZCONFIG_TEST_GSETTINGS libcompizconfig_internal)
+pkg_check_modules (COMPIZCONFIG_TEST_GSETTINGS libcompizconfig_internal gio-2.0 glib-2.0)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2012-06-24 09:00:27 +0000
+++ src/plugin/CMakeLists.txt	2012-09-30 02:10:33 +0000
@@ -42,6 +42,11 @@
   ${PRIVATE_HEADERS}
 )
 
+TARGET_LINK_LIBRARIES(
+  compiz_plugin
+  dl
+)
+
 add_dependencies (compiz_plugin core-options)
 
 ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )