Merge lp:~aacid/unity8/fix_ninja_build into lp:unity8

[Albert Astals Cid]

Fix build with ninja

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Michael Zanetti (mzanetti)]

Please add some comments above those lines that those are to fix ninja or the next one to refactor the LightDM plugis will drop them again.

[lp:~aacid/unity8/fix_ninja_build]

1851. By Albert Astals Cid on 2015-07-10

Comment++

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1850
http://jenkins.qa.ubuntu.com/job/unity8-ci/6013/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/252
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/305
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/305/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21775

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

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

Builds for me now :)

review: Approve

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

Pete did, Jenkins builds it too.

 * Did CI run pass? If not, please explain why.

as much as it can..

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1851
http://jenkins.qa.ubuntu.com/job/unity8-ci/6015/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/254
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/307
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/307/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21779

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2015-06-17 12:14:27 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2015-07-10 08:56:19 +0000
@@ -9,6 +9,9 @@
     dbus.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     )
+# This add_dependencies is needed since we're linking with with -L and -l below
+# make seems to work but ninja breaks without it
+add_dependencies(GreeterDBusTestExec MockLightDM)
 qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
 target_link_libraries(GreeterDBusTestExec
     -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
@@ -44,6 +47,9 @@
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
+# This add_dependencies is needed since we're linking with with -L and -l below
+# make seems to work but ninja breaks without it
+add_dependencies(GreeterUsersModelTestExec MockLightDM)
 qt5_use_modules(GreeterUsersModelTestExec Core Test)
 target_link_libraries(GreeterUsersModelTestExec
     -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm