Merge lp:~alan-griffiths/mir/no-cmake-extras into lp:mir

[Alan Griffiths]

Remove cmake-extras from debian/control

Remove cmake-extras from debian/control

The GMockConfig.cmake from cmake-extras doesn't work for cross-compilation, so we stopped using it.

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

FAILED: Continuous integration, rev:4300
https://mir-jenkins.ubuntu.com/job/mir-ci/3755/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5164/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5401
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5388
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5388
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5388
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5207/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5207/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5207/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5207/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5207/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5207/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5207
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5207/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5207/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Pre-existing problem.

11:03:52 ../../../i386-linux-gnu/crt1.o(.text+0x18): error: undefined reference to 'main'
11:03:52 collect2: error: ld returned 1 exit status
11:03:52 tests/performance-tests/CMakeFiles/mir_compositor_performance_test.dir/build.make:98: recipe for target 'bin/mir_compositor_performance_test.bin' failed
11:03:52 make[3]: *** [bin/mir_compositor_performance_test.bin] Error 1

This is racy:

target_link_libraries(mir_compositor_performance_test
  mir_system_performance_test
  ${GTEST_BOTH_LIBRARIES}
)

With no dependency on the gtest target that builds GTEST_BOTH_LIBRARIES

[Brandon Schaefer (brandontschaefer)]

lgtm

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-10-13 19:01:00 +0000
+++ debian/control	2017-10-24 10:57:24 +0000
@@ -4,7 +4,6 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
-               cmake-extras,
                pkg-config,
                debhelper (>= 9),
                doxygen,