Merge lp:~vanvugt/mir/fix-1388539 into lp:mir

[Daniel van Vugt]

Fix FTBFS in frame-uniformity when MIR_ENABLE_TESTS=OFF (LP: #1388539)
Also tidy up.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2020
http://jenkins.qa.ubuntu.com/job/mir-ci/1965/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/310
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1198
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3235
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15313

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'benchmarks/CMakeLists.txt'
--- benchmarks/CMakeLists.txt	2014-10-30 05:33:07 +0000
+++ benchmarks/CMakeLists.txt	2014-11-02 11:47:32 +0000
@@ -1,14 +1,12 @@
-include_directories(${MIR_3RD_PARTY_INCLUDE_DIRECTORIES})
-include_directories(${MIR_ANDROID_INCLUDE_DIRECTORIES})
-add_custom_target(
-  benchmarks
-)
+add_custom_target(benchmarks)   # XXX Is this used by anything?
+
+add_subdirectory(cpu)
+add_subdirectory(memory)
+add_dependencies(benchmarks cpu_benchmarks memory_benchmarks)
 
 if (MIR_ENABLE_TESTS)
+  # Shouldn't tests dependent things be in tests/?
   add_subdirectory(android-input)
+  add_subdirectory(frame-uniformity)
+  add_dependencies(benchmarks frame_uniformity_test_client)
 endif ()
-add_subdirectory(cpu)
-add_subdirectory(memory)
-add_subdirectory(frame-uniformity)
-
-add_dependencies(benchmarks cpu_benchmarks memory_benchmarks frame_uniformity_test_client)

=== modified file 'benchmarks/android-input/CMakeLists.txt'
--- benchmarks/android-input/CMakeLists.txt	2014-10-01 06:25:56 +0000
+++ benchmarks/android-input/CMakeLists.txt	2014-11-02 11:47:32 +0000
@@ -7,6 +7,8 @@
 include_directories(
   ${Mir_SOURCE_DIR}/tests/include
   ${Mir_SOURCE_DIR}/include/platform
+  ${MIR_ANDROID_INCLUDE_DIRECTORIES}
+  ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}
 )
 
 add_executable(input-reader-perf ${SOURCES})

=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
--- benchmarks/frame-uniformity/CMakeLists.txt	2014-10-22 15:55:37 +0000
+++ benchmarks/frame-uniformity/CMakeLists.txt	2014-11-02 11:47:32 +0000
@@ -7,6 +7,8 @@
 
   ${PROJECT_SOURCE_DIR}/src/include/platform
   ${PROJECT_SOURCE_DIR}
+  ${MIR_ANDROID_INCLUDE_DIRECTORIES}
+  ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}
 )
 
 add_executable(frame_uniformity_test_client
@@ -40,4 +42,4 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-uses_android_input(frame_uniformity_test_client)
\ No newline at end of file
+uses_android_input(frame_uniformity_test_client)