Mir

Merge lp:~andreas-pokorny/mir/fix-1458689 into lp:mir

  1. fix-1458689
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Rejected
Rejected by: Andreas Pokorny
Proposed branch: lp:~andreas-pokorny/mir/fix-1458689
Merge into: lp:mir
Diff against target: 10 lines (+1/-0)
1 file modified
tests/mir_test_framework/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/fix-1458689
Reviewer Review Type Date Requested Status
Alan Griffiths Needs Information
Review via email: mp+260157@code.launchpad.net

Commit message

Ensure that input-stub.so depends on libmirclient.so

Description of the change

libmirclient was not marked as NEEDED inside stub-input platform, and due to the way qtmir loads mirserver and its libraries input-stub cannot resolve the symbol through what is already loaded by the process..

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Are you sure we need PUBLIC?

This should have been fixed in -r 2583 when we added the target_link_libraries clause.

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Note you can test this with mir_demo_server_loader (which loads Mir the same way that qtmir does).

Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

You are right.. I compared a pre rev2583 build of lp:mir with the proposed branch. That fix is not needed.

Unmerged revisions

2599. By Andreas Pokorny

make dependency to mirclient in stub-input explicit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mir_test_framework/CMakeLists.txt'
2--- tests/mir_test_framework/CMakeLists.txt 2015-05-19 21:34:34 +0000
3+++ tests/mir_test_framework/CMakeLists.txt 2015-05-26 13:38:02 +0000
4@@ -107,6 +107,7 @@
5 )
6
7 target_link_libraries(mirplatforminputstub
8+ PUBLIC
9 mirclient
10 )
11

Subscribers

People subscribed via source and target branches