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

[Robert Ancell]

Install and use mirplatform headers

[PS Jenkins bot (ps-jenkins)]

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)

[Alan Griffiths (alan-griffiths)]

Looks like infrastructure - rebuilding

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[Alan Griffiths (alan-griffiths)]

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

[Alan Griffiths (alan-griffiths)]

> 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

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-08-06 07:20:02 +0000
+++ src/server/CMakeLists.txt	2013-08-07 07:23:25 +0000
@@ -17,6 +17,7 @@
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirserver")
+set(PLATFORM_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirplatform")
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
@@ -74,6 +75,7 @@
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   install(DIRECTORY
+    ${CMAKE_SOURCE_DIR}/include/platform/mir DESTINATION "include/mirplatform"
     ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
   )
 else()
 
=== modified file 'src/server/mirserver.pc.in'
--- src/server/mirserver.pc.in	2013-04-24 05:22:20 +0000
+++ src/server/mirserver.pc.in	2013-08-07 07:23:25 +0000
@@ -9,4 +9,4 @@
 Requires.private: protobuf >= 2.4.1
 Requires: mircommon
 Libs: -L@LIBDIR@ -lmirserver
-Cflags: -I@INCLUDEDIR@
+Cflags: -I@PLATFORM_INCLUDEDIR@ -I@INCLUDEDIR@