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

[Daniel van Vugt]

Fix broken cross-compile-chroot.sh (from zesty to yakkety) since we added
support for Google Test/Mock 1.8 (LP: #1646704)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3862
https://mir-jenkins.ubuntu.com/job/mir-ci/2313/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3011
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3076
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3068
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3068
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3068
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3040
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3040/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3040
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3040/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3040
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3040/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3040
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3040/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3040
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3040/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3040
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3040/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2313/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

The environment variable PKG_CONFIG_SYSROOT_DIR might be more common - as in more likely to be set by someone not using the cross_compile script.

review: Approve

[Daniel van Vugt (vanvugt)]

I'm going to clean that up soon. But not until this lands, to avoid conflicts.

=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake	2016-11-28 07:05:38 +0000
+++ cmake/FindGtestGmock.cmake	2016-12-02 09:56:41 +0000
@@ -1,11 +1,17 @@
 include(ExternalProject)
 include(FindPackageHandleStandardArgs)
 
-if (EXISTS /usr/src/googletest)
+#
+# When cross compiling MIR_NDK_PATH points to our chroot.
+# When not cross compiling, it should be blank to use the host system.
+#
+set(usr ${MIR_NDK_PATH}/usr)
+
+if (EXISTS ${usr}/src/googletest)
   set (USING_GOOGLETEST_1_8 TRUE)
-  set (GTEST_INSTALL_DIR /usr/src/googletest/googletest/include)
+  set (GTEST_INSTALL_DIR ${usr}/src/googletest/googletest/include)
 else()
-  set (GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
+  set (GTEST_INSTALL_DIR ${usr}/src/gmock/gtest/include)
 endif()
 
 #gtest
@@ -17,7 +23,7 @@
 #gmock
 find_path(
   GMOCK_INSTALL_DIR CMakeLists.txt
-  HINTS /usr/src/googletest /usr/src/gmock)
+  HINTS ${usr}/src/googletest ${usr}/src/gmock)
 if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
     message(FATAL_ERROR "google-mock package not found")
 endif()