Fix ninja build in a different way
The previous one was adding rpath to some .so that broke our tests that use LD_LIBRARY_PATH to change which one is picked up
commiteb51e69fe6910bf8cd4553ffd0f69902b2341cae
authorAlbert Astals Cid <albert.astals@canonical.com>
dateThu 22 Jan 2015, 17:41 (12 years ago)
parent24e1c78
tests/mocks/LightDM/CMakeLists.txt+2−1
@@ -37,7 +37,8 @@ add_library(MockLightDM-qml MODULE
3737# LD_LIBRARY_PATH.
3838add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
3939target_link_libraries(MockLightDM-qml
40− MockLightDM-full
40+ -L${CMAKE_CURRENT_BINARY_DIR}/full
41+ -llightdm-qt5-2
4142 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
4243 -lusermetricsoutput
4344 unity8-private
tests/plugins/LightDM/CMakeLists.txt+3−1
@@ -11,7 +11,9 @@ include_directories(
1111 ${LIBLIGHTDM_INCLUDE_DIRS}
1212 )
1313
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)
1517
1618add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
1719