git.iko.soy/unity8
on xenial help sign in
Fix ninja build in a different way
eb51e69Albert Astals Cid
tests/mocks/LightDM/CMakeLists.txt+2−1
compare with xenial
unifiedsplit
@@ -37,7 +37,8 @@ add_library(MockLightDM-qml MODULE
37# LD_LIBRARY_PATH.
37# LD_LIBRARY_PATH.
38add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
38add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
39target_link_libraries(MockLightDM-qml
39target_link_libraries(MockLightDM-qml
40− MockLightDM-full
40+ -L${CMAKE_CURRENT_BINARY_DIR}/full
41+ -llightdm-qt5-2
41 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
42 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
42 -lusermetricsoutput
43 -lusermetricsoutput
43 unity8-private
44 unity8-private
tests/plugins/LightDM/CMakeLists.txt+3−1
@@ -11,7 +11,9 @@ include_directories(
11 ${LIBLIGHTDM_INCLUDE_DIRS}
11 ${LIBLIGHTDM_INCLUDE_DIRS}
12 )
12 )
13
13
14−target_link_libraries(GreeterDBusTestExec MockLightDM-full)
14+add_dependencies(GreeterDBusTestExec MockLightDM-full)
15+target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16+ -llightdm-qt5-2)
15
17
16add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
18add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
17
19