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

Proposed by Sam Spilsbury on 2012-01-06
Status: Merged
Merged at revision: 1733
Proposed branch: lp:~smspillaz/unity/4.0-deps
Merge into: lp:unity/4.0
Diff against target: 44 lines (+4/-0)
4 files modified
tests/CMakeLists.txt (+1/-0)
tests/test-get-transients/CMakeLists.txt (+1/-0)
tests/test-input-remover/CMakeLists.txt (+1/-0)
tests/test-minimize-window-handler/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~smspillaz/unity/4.0-deps
Reviewer Review Type Date Requested Status
Didier Roche 2012-01-06 Approve on 2012-01-06
Review via email: mp+87745@code.launchpad.net

This proposal supersedes a proposal from 2012-01-06.

Description of the change

  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.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

works well with it, approved and merging

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
486include_directories (${OPENGL_gl_INCDIRS})486include_directories (${OPENGL_gl_INCDIRS})
487add_library (glfuncloader SHARED487add_library (glfuncloader SHARED
488 ${CMAKE_CURRENT_SOURCE_DIR}/GLFuncLoader.cpp)488 ${CMAKE_CURRENT_SOURCE_DIR}/GLFuncLoader.cpp)
489add_dependencies (glfuncloader unity-core-${UNITY_API_VERSION})
489target_link_libraries (glfuncloader dl ${OPENGL_gl_LIBRARY})490target_link_libraries (glfuncloader dl ${OPENGL_gl_LIBRARY})
490add_executable (screen-effect-fbo491add_executable (screen-effect-fbo
491 TestScreenEffectFramebufferObject.cpp492 TestScreenEffectFramebufferObject.cpp
492493
=== 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 @@
2020
21 target_link_libraries (test-get-transients21 target_link_libraries (test-get-transients
22 ${COMPIZ_TEST_GET_TRANSIENTS_LIBRARIES})22 ${COMPIZ_TEST_GET_TRANSIENTS_LIBRARIES})
23 add_dependencies (test-get-transients unity-core-${UNITY_API_VERSION})
2324
24endif (COMPIZ_TEST_GET_TRANSIENTS_FOUND)25endif (COMPIZ_TEST_GET_TRANSIENTS_FOUND)
2526
=== 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 @@
1616
17 target_link_libraries (test-input-remover17 target_link_libraries (test-input-remover
18 ${COMPIZ_TEST_INPUT_REMOVER_LIBRARIES})18 ${COMPIZ_TEST_INPUT_REMOVER_LIBRARIES})
19 add_dependencies (test-input-remover unity-core-${UNITY_API_VERSION})
1920
20endif (COMPIZ_TEST_INPUT_REMOVER_FOUND)21endif (COMPIZ_TEST_INPUT_REMOVER_FOUND)
2122
=== 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 @@
2121
22 target_link_libraries (test-minimize-handler22 target_link_libraries (test-minimize-handler
23 ${COMPIZ_TEST_MINIMIZED_HANDER_LIBRARIES})23 ${COMPIZ_TEST_MINIMIZED_HANDER_LIBRARIES})
24 add_dependencies (test-minimize-handler unity-core-${UNITY_API_VERSION})
2425
25endif (COMPIZ_TEST_MINIMIZED_HANDER_FOUND)26endif (COMPIZ_TEST_MINIMIZED_HANDER_FOUND)

Subscribers

People subscribed via source and target branches

to all changes: