fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-24 10:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

commented bits cleanup

Browse source
This commit is contained in:
Romain Pokrzywka 2010-02-02 17:31:43 -08:00 • committed by Ralf Habacker
parent 3de7453714
commit b0e0cd03e8
4 changed files with 1 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/bus/CMakeLists.txt
View file

@ -104,20 +104,6 @@ if (DBUS_SERVICE)
endif(WIN32)
endif (DBUS_SERVICE)
## note that TESTS has special meaning (stuff to use in make check)
## so if adding tests not to be run in make check, don't add them to
## TESTS
#if DBUS_BUILD_TESTS
#TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
#TESTS=bus-test
#else
#TESTS=
#endif
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
#noinst_PROGRAMS=$(TESTS)
if (DBUS_BUILD_TESTS)
add_executable(bus-test ${BUS_SOURCES} ${BUS_DIR}/test-main.c)
target_link_libraries(bus-test ${DBUS_LIBRARIES} ${XML_LIBRARY})

19
cmake/dbus/CMakeLists.txt
View file

@ -1,7 +1,5 @@
project(dbus-lib)
#INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
SET(DBUS_DIR ${CMAKE_SOURCE_DIR}/../dbus)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-arch-deps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
@ -164,7 +162,7 @@ set (DBUS_UTIL_SOURCES
${DBUS_DIR}/dbus-message-util.c
${DBUS_DIR}/dbus-shell.c
${DBUS_DIR}/dbus-string-util.c
${DBUS_DIR}/dbus-sysdeps-util.c
${DBUS_DIR}/dbus-sysdeps-util.c
)
if (DBUS_BUILD_TESTS)
@ -298,26 +296,11 @@ add_library(dbus-internal STATIC
${DBUS_UTIL_HEADERS})
target_link_libraries(dbus-internal dbus-1)
#ADD_EXECUTABLE(dbus-example dbus-example.c)
#target_link_libraries(${CMAKE_SOURCE_DIR}/../dbus/dbus-example dbus-1)
#install_targets(/bin dbus-example )
## note that TESTS has special meaning (stuff to use in make check)
## so if adding tests not to be run in make check, don't add them to
## TESTS
#if DBUS_BUILD_TESTS
#TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
#TESTS=dbus-test
#else
#TESTS=
#endif
if (DBUS_BUILD_TESTS)
set (TESTS_ENVIRONMENT "DBUS_TEST_DATA=${CMAKE_SOURCE_DIR}/test/data DBUS_TEST_HOMEDIR=${CMAKE_BUILD_DIR}/dbus")
ADD_EXECUTABLE(dbus-test ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c)
target_link_libraries(dbus-test dbus-1 dbus-internal)
add_test(dbus-test ${EXECUTABLE_OUTPUT_PATH}/dbus-test ${CMAKE_SOURCE_DIR}/../test/data)
#install_targets(/bin dbus-test)
ENDIF (DBUS_BUILD_TESTS)
if (UNIX)

34
cmake/test/CMakeLists.txt
View file

@ -1,41 +1,9 @@
project(test)
#if HAVE_GLIB
# GLIB_SUBDIR=glib
#endif
#if HAVE_PYTHON
# PYTHON_SUBDIR=python
#endif
#if HAVE_QTESTLIB
# QT_SUBDIR=qt
#endif
set(DBUS_LIBRARIES dbus-1 dbus-internal)
add_subdirectory( name-test )
#SUBDIRS=name-test $(GLIB_SUBDIR) $(PYTHON_SUBDIR) $(QT_SUBDIR)
#DIST_SUBDIRS=glib python qt name-test
#INCLUDES=-I$(top_srcdir) $(DBUS_test-CFLAGS)
#if (DBUS_BUILD_TESTS)
## break-loader removed for now
#test-BINARIES=test-service test-names test-shell-service shell-test spawn-test test-segfault test-exit test-sleep-forever
#enable stand alone make check test
#TESTS=shell-test
#else
#test-BINARIES=
#TESTS=
#endif
#if DBUS_GCOV_ENABLED
#GCOV_BINARIES=decode-gcov
#else
#GCOV_BINARIES=
#endif
set (test-service_SOURCES
${CMAKE_SOURCE_DIR}/../test/test-service.c
${CMAKE_SOURCE_DIR}/../test/test-utils.c
@ -110,8 +78,6 @@ target_link_libraries(test-sleep-forever ${DBUS_LIBRARIES})
#add_executable(decode-gcov ${decode_gcov_SOURCES})
#target_link_libraries(decode-gcov ${DBUS_LIBRARIES})
#EXTRA_DIST=
#
### keep these in creation order, i.e. uppermost dirs first
set (TESTDIRS
test/data

2
cmake/test/name-test/CMakeLists.txt
View file

@ -11,12 +11,10 @@ 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})
#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_LIBRARIES})
#install_targets(/bin test-thread-init)
ADD_TEST(test-thread-init ${EXECUTABLE_OUTPUT_PATH}/test-thread-init)
endif (DBUS_BUILD_TESTS)