git.iko.soy/unity8
on xenial help sign in
Two more instances
18a2d70Michał Sawicz
tests/mocks/LightDM/CMakeLists.txt+2−5
compare with xenial
unifiedsplit
@@ -34,12 +34,9 @@ add_library(MockLightDM-qml MODULE
34# installed on the system. So we make sure we link to our full fake version
34# installed on the system. So we make sure we link to our full fake version
35# At run time, we can point to whichever version we happen to be using via
35# At run time, we can point to whichever version we happen to be using via
36# LD_LIBRARY_PATH.
36# LD_LIBRARY_PATH.
37−add_dependencies(MockLightDM-qml MockLightDM MockUserMetrics)
38target_link_libraries(MockLightDM-qml
37target_link_libraries(MockLightDM-qml
39− -L${CMAKE_CURRENT_BINARY_DIR}/liblightdm
38+ MockLightDM
40− -llightdm-qt5-2
39+ MockUserMetrics
41− -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
42− -lusermetricsoutput
43 unity8-private
40 unity8-private
44 )
41 )
45
42
tests/mocks/Unity/Indicators/CMakeLists.txt+1−3
@@ -26,10 +26,8 @@ add_library(IndicatorsFakeQml SHARED
26)
26)
27add_definitions(-DUNITYINDICATORS_LIBRARY)
27add_definitions(-DUNITYINDICATORS_LIBRARY)
28
28
29−add_dependencies(IndicatorsFakeQml QMenuModelQml)
30target_link_libraries(IndicatorsFakeQml
29target_link_libraries(IndicatorsFakeQml
31− -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
30+ QMenuModelQml
32− -lqmenumodel
33)
31)
34
32
35qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
33qt5_use_modules(IndicatorsFakeQml Core Qml Quick)