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

[Albert Astals Cid]

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?
No, Buildsystem only changes

 * 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

[Antti Kaijanmäki (kaijanmaki)]

Yep. incomplete dependency declarations in the CMakeLists.txt file.

[467/787] Linking CXX executable tests/plugins/LightDM/GreeterDBusTestExec
FAILED: : && /usr/bin/ccache g++ -fvisibility=hidden -std=c++11 -fno-permissive -pedantic -Wall -Wextra -g tests/plugins/LightDM/CMakeFiles/GreeterDBusTestExec.dir/dbus.cpp.o tests/plugins/LightDM/CMakeFiles/GreeterDBusTestExec.dir/__/__/__/plugins/LightDM/Greeter.cpp.o tests/plugins/LightDM/CMakeFiles/GreeterDBusTestExec.dir/GreeterDBusTestExec_automoc.cpp.o -o tests/plugins/LightDM/GreeterDBusTestExec -rdynamic /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.2 /usr/lib/x86_64-linux-gnu/libQt5DBus.so.5.3.2 /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5.3.2 /usr/lib/x86_64-linux-gnu/libQt5Test.so.5.3.2 -L/home/antti/branches/unity8/unity8/builddir/tests/mocks/LightDM/full -llightdm-qt5-2 /usr/lib/x86_64-linux-gnu/libQt5Qml.so.5.3.2 /usr/lib/x86_64-linux-gnu/libQt5Network.so.5.3.2 /usr/lib/x86_64-linux-gnu/libQt5Gui.so.5.3.2 /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.2 && :
/usr/bin/ld.bfd.real: cannot find -llightdm-qt5-2
collect2: error: ld returned 1 exit status

There was a target dependency missing. Plain cmake just happens to build the targets in an order that the .so files just happened to be available but ninja reordered the build because it didn't (and couldn't) know about the dependency.

This MP fixes the ninja build, and the CMakeLists.txt causing the failure.

review: Approve

[Michael Zanetti (mzanetti)]

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

yes, builds fine with ninja now, still builds fine with plain make

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

waiting....

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

yes

review: Approve

=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2014-12-19 14:51:35 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2015-01-19 12:06:13 +0000
@@ -37,8 +37,7 @@
 # LD_LIBRARY_PATH.
 add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
 target_link_libraries(MockLightDM-qml
-    -L${CMAKE_CURRENT_BINARY_DIR}/full
-    -llightdm-qt5-2
+    MockLightDM-full
     -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
     -lusermetricsoutput
     unity8-private

=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2014-12-11 15:48:35 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2015-01-19 12:06:13 +0000
@@ -11,10 +11,7 @@
     ${LIBLIGHTDM_INCLUDE_DIRS}
     )
 
-target_link_libraries(GreeterDBusTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
-    -llightdm-qt5-2
-    )
+target_link_libraries(GreeterDBusTestExec MockLightDM-full)
 
 add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")