diff options
| author | Romain Pokrzywka <romain@kdab.com> | 2010-02-02 12:31:31 -0800 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-02-07 00:32:39 +0100 |
| commit | bbd1c9fe826e780cbd251af2654ab05752a96f92 (patch) | |
| tree | 8b1f41e9affc68737437b6c31260f19ea20e836c /cmake/test | |
| parent | ce6951658577c0514c73c09d5847f1a30d45d158 (diff) | |
| download | dbus-bbd1c9fe826e780cbd251af2654ab05752a96f92.tar.gz | |
now fix the build for the tests; turns out we need another set of exports, since some tests are compiled in the client lib and some are in the internal lib...
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, 14 insertions, 12 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index a84bfd1c..1ef15186 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -10,6 +10,8 @@ project(test) # QT_SUBDIR=qt #endif +set(DBUS_LIBRARIES dbus-1 dbus-internal) + add_subdirectory( name-test ) #SUBDIRS=name-test $(GLIB_SUBDIR) $(PYTHON_SUBDIR) $(QT_SUBDIR) @@ -81,32 +83,32 @@ set (decode_gcov_SOURCES ) add_executable(test-service ${test-service_SOURCES}) -target_link_libraries(test-service ${DBUS_1}) +target_link_libraries(test-service ${DBUS_LIBRARIES}) add_executable(test-names ${test-names_SOURCES}) -target_link_libraries(test-names ${DBUS_1}) +target_link_libraries(test-names ${DBUS_LIBRARIES}) add_executable(shell-test ${shell-test_SOURCES}) -target_link_libraries(shell-test ${DBUS_1}) +target_link_libraries(shell-test ${DBUS_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_1}) +target_link_libraries(test-shell-service ${DBUS_LIBRARIES}) add_executable(spawn-test ${spawn-test_SOURCES}) -target_link_libraries(spawn-test ${DBUS_1}) +target_link_libraries(spawn-test ${DBUS_LIBRARIES}) add_executable(test-exit ${test-exit_SOURCES}) -target_link_libraries(test-exit ${DBUS_1}) +target_link_libraries(test-exit ${DBUS_LIBRARIES}) add_executable(test-segfault ${test-segfault_SOURCES}) -target_link_libraries(test-segfault ${DBUS_1}) +target_link_libraries(test-segfault ${DBUS_LIBRARIES}) add_executable(test-sleep-forever ${test-sleep-forever_SOURCES}) -target_link_libraries(test-sleep-forever ${DBUS_1}) +target_link_libraries(test-sleep-forever ${DBUS_LIBRARIES}) #add_executable(decode-gcov ${decode_gcov_SOURCES}) -#target_link_libraries(decode-gcov ${DBUS_1}) +#target_link_libraries(decode-gcov ${DBUS_LIBRARIES}) #EXTRA_DIST= # diff --git a/cmake/test/name-test/CMakeLists.txt b/cmake/test/name-test/CMakeLists.txt index 45683a73..3c4d2a08 100644 --- a/cmake/test/name-test/CMakeLists.txt +++ b/cmake/test/name-test/CMakeLists.txt @@ -6,16 +6,16 @@ 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_1}) +target_link_libraries(test-names2 ${DBUS_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_1}) +target_link_libraries(test-pending-call-dispatch ${DBUS_LIBRARIES}) #install_targets(/bin test-pending-call-dispatch) 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_1}) +target_link_libraries(test-thread-init ${DBUS_LIBRARIES}) #install_targets(/bin test-thread-init) ADD_TEST(test-thread-init ${EXECUTABLE_OUTPUT_PATH}/test-thread-init) |