Mir

Merge lp:~robert-ancell/mir/mirplatform into lp:~mir-team/mir/trunk

  1. mirplatform
  2. Merge into trunk
Proposed by Robert Ancell
Status: Rejected
Rejected by: Alan Griffiths
Proposed branch: lp:~robert-ancell/mir/mirplatform
Merge into: lp:~mir-team/mir/trunk
Diff against target: 29 lines (+3/-1)
2 files modified
src/server/CMakeLists.txt (+2/-0)
src/server/mirserver.pc.in (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/mir/mirplatform
Reviewer Review Type Date Requested Status
Alan Griffiths Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+178895@code.launchpad.net

Commit message

Install and use mirplatform headers

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:934
http://jenkins.qa.ubuntu.com/job/mir-ci/1234/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1631/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/472/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1234/rebuild

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

Looks like infrastructure - rebuilding

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

FAILED: Continuous integration, rev:934
http://jenkins.qa.ubuntu.com/job/mir-ci/1235/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1632/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1517/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/473/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1235/rebuild

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

CMake Error at src/server/CMakeLists.txt:77 (install):
  install DIRECTORY given unknown argument "/mir/include/server/mir".

(I'll submit a fixed version as Robert is offline)

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

> CMake Error at src/server/CMakeLists.txt:77 (install):
> install DIRECTORY given unknown argument "/mir/include/server/mir".
>
> (I'll submit a fixed version as Robert is offline)

https://code.launchpad.net/~alan-griffiths/mir/mirplatform-install-headers/+merge/178909

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/CMakeLists.txt'
2--- src/server/CMakeLists.txt 2013-08-06 07:20:02 +0000
3+++ src/server/CMakeLists.txt 2013-08-07 07:23:25 +0000
4@@ -17,6 +17,7 @@
5 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
6 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
7 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirserver")
8+set(PLATFORM_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirplatform")
9
10 configure_file(
11 ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
12@@ -74,6 +75,7 @@
13 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
14 )
15 install(DIRECTORY
16+ ${CMAKE_SOURCE_DIR}/include/platform/mir DESTINATION "include/mirplatform"
17 ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
18 )
19 else()
20
21=== modified file 'src/server/mirserver.pc.in'
22--- src/server/mirserver.pc.in 2013-04-24 05:22:20 +0000
23+++ src/server/mirserver.pc.in 2013-08-07 07:23:25 +0000
24@@ -9,4 +9,4 @@
25 Requires.private: protobuf >= 2.4.1
26 Requires: mircommon
27 Libs: -L@LIBDIR@ -lmirserver
28-Cflags: -I@INCLUDEDIR@
29+Cflags: -I@PLATFORM_INCLUDEDIR@ -I@INCLUDEDIR@

Subscribers

People subscribed via source and target branches