Merge lp:~alan-griffiths/mir/fix-gmock-detection into lp:mir
Proposed by
Alan Griffiths
Status: | Superseded |
---|---|
Proposed branch: | lp:~alan-griffiths/mir/fix-gmock-detection |
Merge into: | lp:mir |
Diff against target: |
206 lines (+27/-18) 12 files modified
benchmarks/frame-uniformity/CMakeLists.txt (+2/-3) cmake/FindGtestGmock.cmake (+8/-1) debian/control (+1/-0) examples/CMakeLists.txt (+1/-1) examples/miral-kiosk/CMakeLists.txt (+5/-0) tests/CMakeLists.txt (+1/-1) tests/integration-tests/CMakeLists.txt (+1/-2) tests/mir_test_doubles/CMakeLists.txt (+2/-2) tests/mir_test_framework/CMakeLists.txt (+2/-2) tests/performance-tests/CMakeLists.txt (+1/-1) tests/unit-tests/CMakeLists.txt (+2/-4) tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/fix-gmock-detection |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Pending | |
Mir development team | Pending | ||
Review via email: mp+332305@code.launchpad.net |
This proposal has been superseded by a proposal from 2017-10-16.
Commit message
Fix gmock detection in cmake.
At some point since xenial cmake-extras gained a script for finding gmock and gtest. We can use that for most build platforms.
To post a comment you must log in.