Use targets instead of custom ld arguments for linking
This allows for implied dependencies
Approved by: Albert Astals Cid
commit5777b8aa7de06d1882d7ee70b50e0811da706a5f
authorMichał Sawicz <michal.sawicz@canonical.com>
dateWed 18 Mar 2015, 10:17 (12 years ago)
parent5bda3dc18a2d70
tests/mocks/LightDM/CMakeLists.txt+2−5
@@ -34,12 +34,9 @@ add_library(MockLightDM-qml MODULE
3434# installed on the system. So we make sure we link to our full fake version
3535# At run time, we can point to whichever version we happen to be using via
3636# LD_LIBRARY_PATH.
37−add_dependencies(MockLightDM-qml MockLightDM MockUserMetrics)
3837target_link_libraries(MockLightDM-qml
39− -L${CMAKE_CURRENT_BINARY_DIR}/liblightdm
40− -llightdm-qt5-2
41− -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
42− -lusermetricsoutput
38+ MockLightDM
39+ MockUserMetrics
4340 unity8-private
4441 )
4542
tests/mocks/Unity/Indicators/CMakeLists.txt+1−3
@@ -26,10 +26,8 @@ add_library(IndicatorsFakeQml SHARED
2626)
2727add_definitions(-DUNITYINDICATORS_LIBRARY)
2828
29−add_dependencies(IndicatorsFakeQml QMenuModelQml)
3029target_link_libraries(IndicatorsFakeQml
31− -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
32− -lqmenumodel
30+ QMenuModelQml
3331)
3432
3533qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
tests/plugins/LightDM/CMakeLists.txt+2−4
@@ -19,13 +19,11 @@ include_directories(
1919 )
2020
2121target_link_libraries(GreeterDBusTestExec
22− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
23− -llightdm-qt5-2
22+ MockLightDM
2423 )
2524
2625target_link_libraries(GreeterUsersModelTestExec
27− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
28− -llightdm-qt5-2
26+ MockLightDM
2927 )
3028
3129add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")