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
1=== modified file 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2011-12-24 01:44:20 +0000
3+++ tests/CMakeLists.txt 2012-01-06 13:16:09 +0000
4@@ -486,6 +486,7 @@
5 include_directories (${OPENGL_gl_INCDIRS})
6 add_library (glfuncloader SHARED
7 ${CMAKE_CURRENT_SOURCE_DIR}/GLFuncLoader.cpp)
8+add_dependencies (glfuncloader unity-core-${UNITY_API_VERSION})
9 target_link_libraries (glfuncloader dl ${OPENGL_gl_LIBRARY})
10 add_executable (screen-effect-fbo
11 TestScreenEffectFramebufferObject.cpp
12
13=== modified file 'tests/test-get-transients/CMakeLists.txt'
14--- tests/test-get-transients/CMakeLists.txt 2011-08-24 16:46:09 +0000
15+++ tests/test-get-transients/CMakeLists.txt 2012-01-06 13:16:09 +0000
16@@ -20,5 +20,6 @@
17
18 target_link_libraries (test-get-transients
19 ${COMPIZ_TEST_GET_TRANSIENTS_LIBRARIES})
20+ add_dependencies (test-get-transients unity-core-${UNITY_API_VERSION})
21
22 endif (COMPIZ_TEST_GET_TRANSIENTS_FOUND)
23
24=== modified file 'tests/test-input-remover/CMakeLists.txt'
25--- tests/test-input-remover/CMakeLists.txt 2011-08-24 13:46:21 +0000
26+++ tests/test-input-remover/CMakeLists.txt 2012-01-06 13:16:09 +0000
27@@ -16,5 +16,6 @@
28
29 target_link_libraries (test-input-remover
30 ${COMPIZ_TEST_INPUT_REMOVER_LIBRARIES})
31+ add_dependencies (test-input-remover unity-core-${UNITY_API_VERSION})
32
33 endif (COMPIZ_TEST_INPUT_REMOVER_FOUND)
34
35=== modified file 'tests/test-minimize-window-handler/CMakeLists.txt'
36--- tests/test-minimize-window-handler/CMakeLists.txt 2011-08-24 16:52:38 +0000
37+++ tests/test-minimize-window-handler/CMakeLists.txt 2012-01-06 13:16:09 +0000
38@@ -21,5 +21,6 @@
39
40 target_link_libraries (test-minimize-handler
41 ${COMPIZ_TEST_MINIMIZED_HANDER_LIBRARIES})
42+ add_dependencies (test-minimize-handler unity-core-${UNITY_API_VERSION})
43
44 endif (COMPIZ_TEST_MINIMIZED_HANDER_FOUND)

Subscribers

People subscribed via source and target branches

to all changes: