git.iko.soy/unity8
on xenial help sign in
Fix failure to build when using the ./build script with ninja-build installed. Fixes: https://bugs.launchpad.net/bugs/1268525.
c88c02eMichael Terry
tests/mocks/LightDM/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -33,7 +33,7 @@ add_library(MockLightDM-qml MODULE
33# installed on the system. So we make sure we link to our full fake version
33# installed on the system. So we make sure we link to our full fake version
34# At run time, we can point to whichever version we happen to be using via
34# At run time, we can point to whichever version we happen to be using via
35# LD_LIBRARY_PATH.
35# LD_LIBRARY_PATH.
36−add_dependencies(MockLightDM-qml MockLightDM-full)
36+add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
37target_link_libraries(MockLightDM-qml
37target_link_libraries(MockLightDM-qml
38 -L${CMAKE_CURRENT_BINARY_DIR}/full
38 -L${CMAKE_CURRENT_BINARY_DIR}/full
39 -llightdm-qt5-2
39 -llightdm-qt5-2
tests/plugins/LightDM/CMakeLists.txt+1
@@ -11,6 +11,7 @@ include_directories(
11 ${LIBLIGHTDM_INCLUDE_DIRS}
11 ${LIBLIGHTDM_INCLUDE_DIRS}
12 )
12 )
13
13
14+add_dependencies(test-lightdm-dbus MockLightDM-full)
14target_link_libraries(test-lightdm-dbus
15target_link_libraries(test-lightdm-dbus
15 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16 -llightdm-qt5-2
17 -llightdm-qt5-2