diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2010-03-20 22:30:16 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-03-20 22:33:58 +0100 |
| commit | d999abdaa83a89a642ba507d58c36b161e220f3a (patch) | |
| tree | ae01257bb7158341a8379efeb190d93e3169f641 /cmake/test | |
| parent | 235e8dfe2e1b741bbe117825f6d3fc26fc94ca6f (diff) | |
| download | dbus-d999abdaa83a89a642ba507d58c36b161e220f3a.tar.gz | |
CMake dbus libraries usage cleanup.
Renamed DBUS_LIBRARIES to DBUS_INTERNAL_LIBRARIES and moved to top level CMakeLists.txt.
Removed obsolate references of dbus-internal library.
Added DBUS_LIBRARIES definition which contains only the dbus library.
Diffstat (limited to 'cmake/test')
| -rw-r--r-- | cmake/test/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | cmake/test/name-test/CMakeLists.txt | 6 |
2 files changed, 12 insertions, 14 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 6a26362c..93d677dc 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -1,7 +1,5 @@ project(test) -set(DBUS_LIBRARIES dbus-1 dbus-internal) - add_subdirectory( name-test ) set (test-service_SOURCES @@ -51,32 +49,32 @@ set (decode_gcov_SOURCES ) add_executable(test-service ${test-service_SOURCES}) -target_link_libraries(test-service ${DBUS_LIBRARIES}) +target_link_libraries(test-service ${DBUS_INTERNAL_LIBRARIES}) add_executable(test-names ${test-names_SOURCES}) -target_link_libraries(test-names ${DBUS_LIBRARIES}) +target_link_libraries(test-names ${DBUS_INTERNAL_LIBRARIES}) add_executable(shell-test ${shell-test_SOURCES}) -target_link_libraries(shell-test ${DBUS_LIBRARIES}) +target_link_libraries(shell-test ${DBUS_INTERNAL_LIBRARIES}) ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXT}) add_executable(test-shell-service ${test-shell-service_SOURCES}) -target_link_libraries(test-shell-service ${DBUS_LIBRARIES}) +target_link_libraries(test-shell-service ${DBUS_INTERNAL_LIBRARIES}) add_executable(spawn-test ${spawn-test_SOURCES}) -target_link_libraries(spawn-test ${DBUS_LIBRARIES}) +target_link_libraries(spawn-test ${DBUS_INTERNAL_LIBRARIES}) add_executable(test-exit ${test-exit_SOURCES}) -target_link_libraries(test-exit ${DBUS_LIBRARIES}) +target_link_libraries(test-exit ${DBUS_INTERNAL_LIBRARIES}) add_executable(test-segfault ${test-segfault_SOURCES}) -target_link_libraries(test-segfault ${DBUS_LIBRARIES}) +target_link_libraries(test-segfault ${DBUS_INTERNAL_LIBRARIES}) add_executable(test-sleep-forever ${test-sleep-forever_SOURCES}) -target_link_libraries(test-sleep-forever ${DBUS_LIBRARIES}) +target_link_libraries(test-sleep-forever ${DBUS_INTERNAL_LIBRARIES}) #add_executable(decode-gcov ${decode_gcov_SOURCES}) -#target_link_libraries(decode-gcov ${DBUS_LIBRARIES}) +#target_link_libraries(decode-gcov ${DBUS_INTERNAL_LIBRARIES}) ### keep these in creation order, i.e. uppermost dirs first set (TESTDIRS diff --git a/cmake/test/name-test/CMakeLists.txt b/cmake/test/name-test/CMakeLists.txt index df6d178b..d26e642d 100644 --- a/cmake/test/name-test/CMakeLists.txt +++ b/cmake/test/name-test/CMakeLists.txt @@ -6,15 +6,15 @@ add_definitions(-DDBUS_COMPILATION) # there is also a test-names executable, don't know if this is the same add_executable(test-names2 ${NAMEtest-DIR}/test-names.c) -target_link_libraries(test-names2 ${DBUS_LIBRARIES}) +target_link_libraries(test-names2 ${DBUS_INTERNAL_LIBRARIES}) ADD_TEST(test-names2 ${EXECUTABLE_OUTPUT_PATH}/test-names2) add_executable(test-pending-call-dispatch ${NAMEtest-DIR}/test-pending-call-dispatch.c) -target_link_libraries(test-pending-call-dispatch ${DBUS_LIBRARIES}) +target_link_libraries(test-pending-call-dispatch ${DBUS_INTERNAL_LIBRARIES}) ADD_TEST(test-pending-call-dispatch ${EXECUTABLE_OUTPUT_PATH}/test-pending-call-dispatch) add_executable(test-thread-init ${NAMEtest-DIR}/test-threads-init.c) -target_link_libraries(test-thread-init ${DBUS_LIBRARIES}) +target_link_libraries(test-thread-init ${DBUS_INTERNAL_LIBRARIES}) ADD_TEST(test-thread-init ${EXECUTABLE_OUTPUT_PATH}/test-thread-init) endif (DBUS_BUILD_TESTS) |