git.iko.soy/unity8
on xenial help sign in
Use a different name for test and binary
02af4afMichael Terry
tests/plugins/LightDM/CMakeLists.txt+4−4
compare with xenial
unifiedsplit
@@ -1,8 +1,8 @@
1−add_executable(testLightDMDBus
1+add_executable(test-lightdm-dbus
2 dbus.cpp
2 dbus.cpp
3 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
3 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
4 )
4 )
5−qt5_use_modules(testLightDMDBus Core DBus Quick Test)
5+qt5_use_modules(test-lightdm-dbus Core DBus Quick Test)
6
6
7include_directories(
7include_directories(
8 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
@@ -11,7 +11,7 @@ include_directories(
11 ${LIBLIGHTDM_INCLUDE_DIRS}
11 ${LIBLIGHTDM_INCLUDE_DIRS}
12 )
12 )
13
13
14−target_link_libraries(testLightDMDBus
14+target_link_libraries(test-lightdm-dbus
15 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
15 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16 -llightdm-qt5-2
16 -llightdm-qt5-2
17 )
17 )
@@ -19,5 +19,5 @@ target_link_libraries(testLightDMDBus
19add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
19add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
20
20
21add_test(NAME testLightDMDBus
21add_test(NAME testLightDMDBus
22− COMMAND dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/testLightDMDBus
22+ COMMAND dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus
23 )
23 )