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

[Kevin DuBois]

build system: fix the MIR_PLATFORM cmake variable if defined to MIR_PLATFORM=android or MIR_PLATFORM=mesa.

fixes: lp: #1447729

build system: fix the MIR_PLATFORM cmake variable if defined to MIR_PLATFORM=android or MIR_PLATFORM=mesa.

fixes: lp: #1447729

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2509
http://jenkins.qa.ubuntu.com/job/mir-ci/3599/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1596
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1596/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2109
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5030
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19881

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

=== modified file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2015-04-09 06:20:31 +0000
+++ cmake/ABICheck.cmake	2015-04-23 18:04:18 +0000
@@ -80,10 +80,14 @@
 make_lib_descriptor(server)
 make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${mircommon-exclude-headers})
 make_lib_descriptor(platform INCLUDE_PRIVATE EXCLUDE_HEADERS ${mirplatform-exclude-headers})
+if(MIR_BUILD_PLATFORM_MESA)
 make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
+make_lib_descriptor(platformgraphicsmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
+endif()
+if(MIR_BUILD_PLATFORM_ANDROID)
 make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
-make_lib_descriptor(platformgraphicsmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
 make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
+endif()
 
 add_custom_target(abi-release-dump
   COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
@@ -120,7 +124,13 @@
   )
 endmacro(_define_abi_check_for)
 
-set(the_libs mirserver mirclient mircommon mirplatform mirclientplatformmesa mirclientplatformandroid mirplatformgraphicsmesa mirplatformgraphicsandroid)
+set(the_libs mirserver mirclient mircommon mirplatform)
+if(MIR_BUILD_PLATFORM_MESA)
+  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesa)
+endif()
+if(MIR_BUILD_PLATFORM_ANDROID)
+  set(the_libs ${the_libs} mirclientplatformandroid mirplatformgraphicsandroid)
+endif()
 
 foreach(libname ${the_libs})
   _define_abi_dump_for(${libname})