Merge lp:~smspillaz/unity/4.0-deps into lp:unity/4.0

[Sam Spilsbury]

  Also add a dependency on libunity-core for the window handling tests and
  the glfuncloader dlopen loader since link_libraries forces those to be linked
  against libunity-core and since link_libraries doesn't care about target
  dependencies, there is a build race where libunity-core isn't built in time
  for those targets to be (erroneously) linked to.

  The real solution is to kill the call to link_libraries.

[Didier Roche-Tolomelli (didrocks)]

works well with it, approved and merging

review: Approve

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-12-24 01:44:20 +0000
+++ tests/CMakeLists.txt	2012-01-06 13:16:09 +0000
@@ -486,6 +486,7 @@
 include_directories (${OPENGL_gl_INCDIRS})
 add_library (glfuncloader SHARED
 	     ${CMAKE_CURRENT_SOURCE_DIR}/GLFuncLoader.cpp)
+add_dependencies (glfuncloader unity-core-${UNITY_API_VERSION})
 target_link_libraries (glfuncloader dl ${OPENGL_gl_LIBRARY})
 add_executable (screen-effect-fbo
 		TestScreenEffectFramebufferObject.cpp
 
=== modified file 'tests/test-get-transients/CMakeLists.txt'
--- tests/test-get-transients/CMakeLists.txt	2011-08-24 16:46:09 +0000
+++ tests/test-get-transients/CMakeLists.txt	2012-01-06 13:16:09 +0000
@@ -20,5 +20,6 @@
 
 	target_link_libraries (test-get-transients
 			       ${COMPIZ_TEST_GET_TRANSIENTS_LIBRARIES})
+	add_dependencies (test-get-transients unity-core-${UNITY_API_VERSION})
 
 endif (COMPIZ_TEST_GET_TRANSIENTS_FOUND)
 
=== modified file 'tests/test-input-remover/CMakeLists.txt'
--- tests/test-input-remover/CMakeLists.txt	2011-08-24 13:46:21 +0000
+++ tests/test-input-remover/CMakeLists.txt	2012-01-06 13:16:09 +0000
@@ -16,5 +16,6 @@
 
 	target_link_libraries (test-input-remover
 			       ${COMPIZ_TEST_INPUT_REMOVER_LIBRARIES})
+	add_dependencies (test-input-remover unity-core-${UNITY_API_VERSION})
 
 endif (COMPIZ_TEST_INPUT_REMOVER_FOUND)
 
=== modified file 'tests/test-minimize-window-handler/CMakeLists.txt'
--- tests/test-minimize-window-handler/CMakeLists.txt	2011-08-24 16:52:38 +0000
+++ tests/test-minimize-window-handler/CMakeLists.txt	2012-01-06 13:16:09 +0000
@@ -21,5 +21,6 @@
 
 	target_link_libraries (test-minimize-handler
 			       ${COMPIZ_TEST_MINIMIZED_HANDER_LIBRARIES})
+	add_dependencies (test-minimize-handler unity-core-${UNITY_API_VERSION})
 
 endif (COMPIZ_TEST_MINIMIZED_HANDER_FOUND)