Mir

Merge lp:~andreas-pokorny/mir/fix-missing-system-path into lp:mir

  1. fix-missing-system-path
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1293
Proposed branch: lp:~andreas-pokorny/mir/fix-missing-system-path
Merge into: lp:mir
Diff against target: 14 lines (+2/-2)
1 file modified
cmake/LinuxCrossCompile.cmake (+2/-2)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/fix-missing-system-path
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Kevin DuBois (community) Approve
kevin gunn (community) Approve
Review via email: mp+199529@code.launchpad.net

Commit message

Fixes the build problem with the current chroot setup.
This fixes Mir build failures (LP: #1262305)

Description of the change

Fixes the build problem with the current chroot setup.

To post a comment you must log in.
Revision history for this message
kevin gunn (kgunn72) wrote :

lgtm

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

I guess this okay. The real fix is to depend-upon android-headers (which deprecated android-platform-headers) and use cmake's pkgconfig utilities to figure this out.

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

I'll revise, this is probably okay as a band aid. we should use the real fix as quickly as possible

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Yep, it does fix the bug.

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 'cmake/LinuxCrossCompile.cmake'
2--- cmake/LinuxCrossCompile.cmake 2013-08-28 03:41:48 +0000
3+++ cmake/LinuxCrossCompile.cmake 2013-12-18 18:47:53 +0000
4@@ -12,8 +12,8 @@
5 set(CMAKE_FIND_ROOT_PATH "${MIR_NDK_PATH}")
6
7 #treat the chroot's includes as system includes
8-include_directories(SYSTEM ${MIR_NDK_PATH}/usr/include)
9-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${MIR_NDK_PATH}/usr/include")
10+include_directories(SYSTEM "${MIR_NDK_PATH}/usr/include" "${MIR_NDK_PATH}/usr/include/${MIR_ARM_EABI}")
11+list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${MIR_NDK_PATH}/usr/include" "${MIR_NDK_PATH}/usr/include/${MIR_ARM_EABI}" )
12
13 # Add the chroot libraries as system libraries
14 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH

Subscribers

People subscribed via source and target branches