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

[Kevin DuBois]

fix sbuild cross compilation failure by passing the compiler variables to the gtest/gmock sub-project instead of our toolchain file. Also allow for setting MIR_TARGET_MACHINE and MIR_GCC_VARIANT via cmake -DMIR_TARGET_MACHINE=... (previously it was had to be set in the environment)

fixes: lp: #1493895

fix sbuild cross compilation failure by passing the compiler variables to the gtest/gmock sub-project instead of our toolchain file. Also allow for setting MIR_TARGET_MACHINE and MIR_GCC_VARIANT via cmake -DMIR_TARGET_MACHINE=... (previously it was had to be set in the environment)

fixes: lp: #1493895

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2914
http://jenkins.qa.ubuntu.com/job/mir-ci/4840/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3884/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/989
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/989/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3830
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6558
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23177

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2915
http://jenkins.qa.ubuntu.com/job/mir-ci/4843/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/992
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/992/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3833
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3833/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6561
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23186

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake	2015-09-02 10:04:23 +0000
+++ cmake/FindGtestGmock.cmake	2015-09-09 18:37:59 +0000
@@ -29,7 +29,12 @@
 list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
 list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
 if (${CMAKE_CROSSCOMPILING})
-  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
+  if(DEFINED MIR_NDK_PATH)
+    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
+  else()
+    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
+  endif()
 endif()
 
 ExternalProject_Add(

=== modified file 'cmake/LinuxCrossCompile.cmake'
--- cmake/LinuxCrossCompile.cmake	2015-09-02 10:29:38 +0000
+++ cmake/LinuxCrossCompile.cmake	2015-09-09 18:37:59 +0000
@@ -2,8 +2,13 @@
 set(CMAKE_SYSTEM_VERSION 1)
 
 set(MIR_NDK_PATH $ENV{MIR_NDK_PATH} CACHE STRING "path of mir android bundle")
-set(MIR_TARGET_MACHINE $ENV{MIR_TARGET_MACHINE} CACHE STRING "target machine")
-set(MIR_GCC_VARIANT $ENV{MIR_GCC_VARIANT} CACHE STRING "gcc variant required")
+
+if (NOT DEFINED MIR_TARGET_MACHINE)
+  set(MIR_TARGET_MACHINE $ENV{MIR_TARGET_MACHINE} CACHE STRING "target machine")
+endif()
+if (NOT DEFINED MIR_GCC_VARIANT)
+  set(MIR_GCC_VARIANT $ENV{MIR_GCC_VARIANT} CACHE STRING "gcc variant required")
+endif()
 
 set(CMAKE_C_COMPILER   /usr/bin/${MIR_TARGET_MACHINE}-gcc${MIR_GCC_VARIANT})
 set(CMAKE_CXX_COMPILER /usr/bin/${MIR_TARGET_MACHINE}-g++${MIR_GCC_VARIANT})