Mir

Merge lp:~vanvugt/mir/fix-1401373 into lp:mir

Proposed by Daniel van Vugt
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: no longer in the source branch.
Merged at revision: 2172
Proposed branch: lp:~vanvugt/mir/fix-1401373
Merge into: lp:mir
Diff against target: 19 lines (+1/-2)
1 file modified
tests/mir_test_framework/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1401373
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Cemil Azizoglu (community) Approve
Alan Griffiths Approve
Review via email: mp+245072@code.launchpad.net

Commit message

Resolve undefined symbols in libmirplatformstub.so (LP: #1401373)

Seems I missed a spot when we fixed the rest of these in r1997.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Network problem? Re-TAing.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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 2014-12-15 06:24:03 +0000
3+++ tests/mir_test_framework/CMakeLists.txt 2014-12-18 07:11:00 +0000
4@@ -80,14 +80,13 @@
5 COMMENT "Copying testing cursor themes to build dir..."
6 )
7
8-string (REPLACE " -Wl,--no-undefined" " " CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
9-
10 add_library(
11 mirplatformstub SHARED
12 stubbed_graphics_platform.cpp
13 )
14
15 target_link_libraries(mirplatformstub
16+ mirplatform
17 mir-test-doubles
18 mir-test
19 )

Subscribers

People subscribed via source and target branches