mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-23 18:32:55 +00:00
link D-Bus test to KtDBus from katie_dbus_test()
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
7baf170d18
commit
2ef00ba87c
16 changed files with 4 additions and 30 deletions
|
@ -368,7 +368,7 @@ macro(KATIE_DBUS_TEST TESTNAME TESTSOURCES)
|
|||
|
||||
add_executable(${TESTNAME} ${${TESTNAME}_SOURCES})
|
||||
|
||||
target_link_libraries(${TESTNAME} KtCore KtTest)
|
||||
target_link_libraries(${TESTNAME} KtCore KtDBus KtTest)
|
||||
target_compile_definitions(
|
||||
${TESTNAME} PRIVATE
|
||||
-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/"
|
||||
|
|
|
@ -4,8 +4,6 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/myobject.h
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusabstractadaptor KtDBus)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
katie_setup_target(qmyserver
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp
|
||||
|
|
|
@ -7,8 +7,6 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/pinger.h
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusabstractinterface KtDBus)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
katie_setup_target(qpinger
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/qpinger/qpinger.cpp
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusconnection
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusconnection.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusconnection KtDBus)
|
||||
endif()
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbuscontext
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuscontext.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbuscontext KtDBus)
|
||||
endif()
|
|
@ -4,8 +4,6 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/myobject.h
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusinterface KtDBus)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
katie_setup_target(qmyserver2
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbuslocalcalls
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuslocalcalls.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbuslocalcalls KtDBus)
|
||||
endif()
|
|
@ -6,7 +6,7 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/common.h
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusmarshall KtDBus ${DBUS_LIBRARIES})
|
||||
target_link_libraries(tst_qdbusmarshall ${DBUS_LIBRARIES})
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
katie_setup_target(qpong
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusmetaobject
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmetaobject.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusmetaobject KtDBus)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusmetatype
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmetatype.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusmetatype KtDBus)
|
||||
endif()
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbuspendingcall
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuspendingcall.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbuspendingcall KtDBus)
|
||||
endif()
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusreply
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusreply.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusreply KtDBus)
|
||||
endif()
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusservicewatcher
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusservicewatcher.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusservicewatcher KtDBus)
|
||||
endif()
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusthreading
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusthreading.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusthreading KtDBus)
|
||||
endif()
|
||||
|
|
|
@ -5,5 +5,5 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbustype.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbustype KtDBus ${DBUS_LIBRARIES})
|
||||
target_link_libraries(tst_qdbustype ${DBUS_LIBRARIES})
|
||||
endif()
|
||||
|
|
|
@ -2,6 +2,4 @@ if(WITH_DBUS AND DBUS_FOUND)
|
|||
katie_dbus_test(tst_qdbusxmlparser
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusxmlparser.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(tst_qdbusxmlparser KtDBus)
|
||||
endif()
|
||||
|
|
Loading…
Add table
Reference in a new issue