Merge lp:~kgunn72/mir/add_system_to_include_dirs into lp:mir

[kevin gunn]

add SYSTEM to system directories

In order to be able to build with snapcraft with all dependencies installed in a local project directory, SYSTEM needs to be used for directories for items that would normally be installed on the system. Otherwise, cmake will treat these directories as non-system, which causes their warnings to be interpreted as compile errors and fail to build.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3109
http://jenkins.qa.ubuntu.com/job/mir-ci/5603/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3849
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4889/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/845/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1756
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/843
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4889
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4889/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7455/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25312
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/846/console

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

EGL/GL didn't have clean enough headers to use -I?

review: Needs Information

[kevin gunn (kgunn72)]

Not that EGL/GL headers change, but this future proofs that. EGL/GL is something that actually _is_ part of the system so I added it.
I honestly didn't try, but I can swap it out and try if you think we shouldn't.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3109
http://jenkins.qa.ubuntu.com/job/mir-ci/5723/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5059
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/57/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5059
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5059/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7593
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25644
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/55/console

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5136/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/37
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/37
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5084
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5084/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7614
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25687

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

"[ 17%] Building CXX object src/platforms/android/server/CMakeFiles/mirplatformgraphicsandroidobjects.dir/display_buffer.cpp.o
Build timed out (after 120 minutes). Marking the build as failed."

Umm looks like just a CI hiccup. Let's try again.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-16 06:12:44 +0000
+++ CMakeLists.txt	2015-11-20 01:22:19 +0000
@@ -125,7 +125,7 @@
 
 # Check for boost
 find_package(Boost 1.48.0 COMPONENTS date_time system program_options filesystem REQUIRED)
-include_directories (
+include_directories (SYSTEM
   ${Boost_INCLUDE_DIRS}
 )
 
@@ -179,9 +179,9 @@
 pkg_check_modules(NETTLE REQUIRED nettle)
 pkg_check_modules(UUID REQUIRED uuid)
 
-include_directories (${GLESv2_INCLUDE_DIRS})
-include_directories (${EGL_INCLUDE_DIRS})
-include_directories (${GLM_INCLUDE_DIRS})
+include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
+include_directories (SYSTEM ${EGL_INCLUDE_DIRS})
+include_directories (SYSTEM ${GLM_INCLUDE_DIRS})
 
 if (MIR_BUILD_PLATFORM_ANDROID)
   find_package(AndroidProperties REQUIRED)