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

[Sam Spilsbury]

Link libx11.so and use pkg_check_modules (LP: #1077866)

Link libx11.so and use pkg_check_modules

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3464
http://jenkins.qa.ubuntu.com/job/compiz-ci/239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/239/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

That's weird. Both gl and gtk+-3.0 (via gdk-3.0) already have dependencies on x11 defined in their .pc files. However they are listed as "Requires.private" meaning the dependencies are not automatically included. Why?!

[Daniel van Vugt (vanvugt)]

Yep, it works.

review: Approve

[Sam Spilsbury (smspillaz)]

I believe that pkg-config doesn't list those dependencies because they
are effectively pulled in at runtime. In any case, gold doesn't like
that.

I wonder if we can build with gold and clang++ on jenkins...

On Tue, Nov 13, 2012 at 10:21 AM, Daniel van Vugt
<email address hidden> wrote:
> That's weird. Both gl and gtk+-3.0 (via gdk-3.0) already have dependencies on x11 defined in their .pc files. However they are listed as "Requires.private" meaning the dependencies are not automatically included. Why?!
> --
> https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1077866/+merge/133906
> Your team Compiz Maintainers is subscribed to branch lp:compiz.

--
Sam Spilsbury

=== modified file 'tests/system/untest/CMakeLists.txt'
--- tests/system/untest/CMakeLists.txt	2012-11-07 10:44:39 +0000
+++ tests/system/untest/CMakeLists.txt	2012-11-12 12:19:21 +0000
@@ -1,11 +1,9 @@
-
 cmake_minimum_required (VERSION 2.6)
 
 include (FindPkgConfig)
-pkg_search_module (GTK REQUIRED gtk+-3.0)
-pkg_search_module (GL REQUIRED gl)
+pkg_check_modules (COMPIZ_UNTEST REQUIRED gtk+-3.0 gl x11)
 
 add_executable (untest untest.c)
-include_directories (${GTK_INCLUDE_DIRS} ${GL_INCLUDE_DIRS})
-link_directories (${GTK_LIBRARY_DIRS} ${GL_LIBRARY_DIRECTORIES})
-target_link_libraries (untest ${GTK_LIBRARIES} ${GL_LIBRARIES})
+include_directories (${COMPIZ_UNTEST_INCLUDE_DIRS})
+link_directories (${COMPIZ_UNTEST_LIBRARY_DIRS})
+target_link_libraries (untest ${COMPIZ_UNTEST_LIBRARIES})