Unity 8

Merge lp:~mterry/unity8/cmake-deps into lp:unity8

  1. cmake-deps
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Michał Sawicz
Approved revision: 636
Merged at revision: 637
Proposed branch: lp:~mterry/unity8/cmake-deps
Merge into: lp:unity8
Diff against target: 24 lines (+2/-1)
2 files modified
tests/mocks/LightDM/CMakeLists.txt (+1/-1)
tests/plugins/LightDM/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~mterry/unity8/cmake-deps
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+201673@code.launchpad.net

Commit message

Fix failure to build when using the ./build script with ninja-build installed.

Description of the change

Fix failure to build when using the ./build script with ninja-build installed.

This is because the lightdm dbus test didn't declare its dependency on the mock 'full' lightdm library. This branch fixes that and also another similar missing dep I noticed on our mock usermetrics library.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/unity8-ci/2062/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/586
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/586/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2346
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2220
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2220/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4677
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3102

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup, helps! Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
2--- tests/mocks/LightDM/CMakeLists.txt 2013-12-17 14:56:25 +0000
3+++ tests/mocks/LightDM/CMakeLists.txt 2014-01-14 21:05:23 +0000
4@@ -33,7 +33,7 @@
5 # installed on the system. So we make sure we link to our full fake version
6 # At run time, we can point to whichever version we happen to be using via
7 # LD_LIBRARY_PATH.
8-add_dependencies(MockLightDM-qml MockLightDM-full)
9+add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
10 target_link_libraries(MockLightDM-qml
11 -L${CMAKE_CURRENT_BINARY_DIR}/full
12 -llightdm-qt5-2
13
14=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
15--- tests/plugins/LightDM/CMakeLists.txt 2013-12-03 16:55:03 +0000
16+++ tests/plugins/LightDM/CMakeLists.txt 2014-01-14 21:05:23 +0000
17@@ -11,6 +11,7 @@
18 ${LIBLIGHTDM_INCLUDE_DIRS}
19 )
20
21+add_dependencies(test-lightdm-dbus MockLightDM-full)
22 target_link_libraries(test-lightdm-dbus
23 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
24 -llightdm-qt5-2

Subscribers

People subscribed via source and target branches