Mir

Merge lp:~alan-griffiths/mir/fix-1276565 into lp:mir

  1. fix-1276565
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1371
Proposed branch: lp:~alan-griffiths/mir/fix-1276565
Merge into: lp:mir
Diff against target: 11 lines (+1/-1)
1 file modified
src/client/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1276565
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Daniel d'Andrada (community) Approve
Alexandros Frantzis (community) Approve
Review via email: mp+204899@code.launchpad.net

Commit message

client: Add include/client/mir to libmirclient-dev install

Description of the change

client: Add include/client/mir to libmirclient-dev install

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK.

review: Approve
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Solves the problem.

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

FAILED: Continuous integration, rev:1369
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/777/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/803
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/401/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/507
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/507/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/511/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/402/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/777/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/810
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/408/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/246
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/247
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/247/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/409/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) :
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 'src/client/CMakeLists.txt'
2--- src/client/CMakeLists.txt 2014-01-28 09:06:46 +0000
3+++ src/client/CMakeLists.txt 2014-02-05 13:03:24 +0000
4@@ -117,7 +117,7 @@
5 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
6
7 install(
8- DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit
9+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit ${CMAKE_SOURCE_DIR}/include/client/mir
10 DESTINATION "include/mirclient"
11 )
12

Subscribers

People subscribed via source and target branches