Mir

Merge lp:~alan-griffiths/mir/mirplatform-install-headers into lp:~mir-team/mir/trunk

Proposed by Alan Griffiths on 2013-08-07
Status: Merged
Approved by: Alexandros Frantzis on 2013-08-07
Approved revision: 938
Merged at revision: 937
Proposed branch: lp:~alan-griffiths/mir/mirplatform-install-headers
Merge into: lp:~mir-team/mir/trunk
Diff against target: 58 lines (+6/-4)
4 files modified
debian/libmirserver-dev.install (+1/-0)
src/platform/graphics/CMakeLists.txt (+0/-3)
src/server/CMakeLists.txt (+4/-0)
src/server/mirserver.pc.in (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/mirplatform-install-headers
Reviewer Review Type Date Requested Status
Thomas Voß (community) Approve on 2013-08-07
Alexandros Frantzis (community) 2013-08-07 Approve on 2013-08-07
PS Jenkins bot (community) continuous-integration Approve on 2013-08-07
Review via email: mp+178909@code.launchpad.net

Commit message

platform: Install and use mirplatform headers

Description of the change

platform: Install and use mirplatform headers

To post a comment you must log in.
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Alexandros Frantzis (afrantzis) wrote :

... except that the headers aren't added any package.

review: Needs Fixing
938. By Alan Griffiths on 2013-08-07

Add platform headers

Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Thomas Voß (thomas-voss) wrote :

LGTM, building mir locally and usc against that version works fine for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/libmirserver-dev.install'
2--- debian/libmirserver-dev.install 2013-06-24 12:15:28 +0000
3+++ debian/libmirserver-dev.install 2013-08-07 08:58:25 +0000
4@@ -1,3 +1,4 @@
5+usr/include/mirplatform
6 usr/include/mirserver
7 usr/lib/*/pkgconfig/mirserver.pc
8 usr/lib/*/libmirserver.so
9
10=== modified file 'src/platform/graphics/CMakeLists.txt'
11--- src/platform/graphics/CMakeLists.txt 2013-08-06 11:55:20 +0000
12+++ src/platform/graphics/CMakeLists.txt 2013-08-07 08:58:25 +0000
13@@ -1,5 +1,3 @@
14-include_directories(${GLESv2_INCLUDE_DIRS})
15-
16 set(
17 GRAPHICS_SOURCES
18
19@@ -22,7 +20,6 @@
20 mirsharedgeometry
21
22 ${EGL_LDFLAGS} ${EGL_LIBRARIES}
23- ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
24 )
25
26 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
27
28=== modified file 'src/server/CMakeLists.txt'
29--- src/server/CMakeLists.txt 2013-08-06 07:20:02 +0000
30+++ src/server/CMakeLists.txt 2013-08-07 08:58:25 +0000
31@@ -17,6 +17,7 @@
32 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
33 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
34 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirserver")
35+set(PLATFORM_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirplatform")
36
37 configure_file(
38 ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
39@@ -74,6 +75,9 @@
40 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
41 )
42 install(DIRECTORY
43+ ${CMAKE_SOURCE_DIR}/include/platform/mir DESTINATION "include/mirplatform"
44+ )
45+ install(DIRECTORY
46 ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
47 )
48 else()
49
50=== modified file 'src/server/mirserver.pc.in'
51--- src/server/mirserver.pc.in 2013-04-24 05:22:20 +0000
52+++ src/server/mirserver.pc.in 2013-08-07 08:58:25 +0000
53@@ -9,4 +9,4 @@
54 Requires.private: protobuf >= 2.4.1
55 Requires: mircommon
56 Libs: -L@LIBDIR@ -lmirserver
57-Cflags: -I@INCLUDEDIR@
58+Cflags: -I@PLATFORM_INCLUDEDIR@ -I@INCLUDEDIR@

Subscribers

People subscribed via source and target branches