Merge lp:~kdub/mir/fix-1480932 into lp:mir

[Kevin DuBois]

build system: fix up option for -DMIR_PLATFORM=android
fixes: lp: #1480932

build system: fix up option for -DMIR_PLATFORM=android
fixes: lp: #1480932

[Alan Griffiths (alan-griffiths)]

Looks sensible

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2807
http://jenkins.qa.ubuntu.com/job/mir-ci/4461/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3386
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/610
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3334
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3334/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6125
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22285

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Looks like a change that if wrong, Jenkins would have mentioned.

review: Approve

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-07-29 01:18:16 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-08-03 15:35:10 +0000
@@ -125,33 +125,32 @@
   ${GMOCK_MAIN_LIBRARY}
   ${Boost_LIBRARIES}
   ${UMOCKDEV_LIBRARIES}
-  # Mesa platform dependencies
-  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
-  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
-  # Android platform dependencies
-  ${LIBHARDWARE_LIBRARIES}
-  ${ANDROID_PROPERTIES_LIBRARIES}
-  # Shared platform dependencies
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-  ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
-  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
   ${MIR_PLATFORM_REFERENCES}
   ${MIR_COMMON_REFERENCES}
   ${MIR_SERVER_REFERENCES}
   ${XKBCOMMON_LIBRARIES}
 )
 
-target_link_libraries(mir_unit_tests
-  mirsharedmesaservercommon-static
+if ((MIR_BUILD_PLATFORM_MESA_KMS) OR (MIR_BUILD_PLATFORM_MESA_X11))
+target_link_libraries(mir_unit_tests
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+  mirsharedmesaservercommon-static)
+endif()
+
+if (MIR_BUILD_PLATFORM_MESA_KMS)
+target_link_libraries(mir_unit_tests
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
+endif()
 
 if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_unit_tests 
   mirsharedandroid-static
-  ${ANDROID_PROPERTIES_LDFLAGS}
+  ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
+  ${ANDROID_PROPERTIES_LDFLAGS} ${ANDROID_PROPERTIES_LIBRARIES}
 )
 endif()